Fix/cleanup: Added missing license headers and removed unused files.

Change-Id: Ibaf91b89e3b1dc13a50130bb2bd0a22afc6ec19e
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
diff --git a/src/emuvim/test/test-initial-template.yml b/src/emuvim/test/test-initial-template.yml
deleted file mode 100755
index be2c9c5..0000000
--- a/src/emuvim/test/test-initial-template.yml
+++ /dev/null
@@ -1,276 +0,0 @@
----
-heat_template_version: '2015-04-30'
-resources:
-  firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Router
-    properties:
-      name: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Router
-    properties:
-      name: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router: 20790da5-2dc1-4c7e-b9c3-a8d590517563
-      subnet:
-        get_resource: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
diff --git a/src/emuvim/test/test-scaleout-template.yml b/src/emuvim/test/test-scaleout-template.yml
deleted file mode 100755
index 0006c85..0000000
--- a/src/emuvim/test/test-scaleout-template.yml
+++ /dev/null
@@ -1,479 +0,0 @@
----
-heat_template_version: '2015-04-30'
-resources:
-  firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  floating:tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
-      port_id:
-        get_resource: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.1.0/29
-      gateway_ip: 192.1.0.1
-      name: loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Router
-    properties:
-      name: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Router
-    properties:
-      name: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Router
-    properties:
-      name: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router: 20790da5-2dc1-4c7e-b9c3-a8d590517563
-      subnet:
-        get_resource: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:loadbalancer-2-tcpdump:2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Nova::Server
-    properties:
-      flavor:
-        flavorName: m1.small
-        vcpu: 2
-        ram: 2048
-        storage: 20
-      image: ubuntu:trusty
-      name: tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      networks:
-      - port:
-          get_resource: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      - port:
-          get_resource: tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Port
-    properties:
-      name: tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:loadbalancer-2-tcpdump:3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router:
-        get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      subnet:
-        get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Net
-    properties:
-      name: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-  tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: 192.0.2.0/29
-      gateway_ip: 192.1.0.1
-      name: tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
-      network:
-        get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
diff --git a/src/emuvim/test/unittests/templates/test_heatapi_keystone_get_token.yml b/src/emuvim/test/unittests/templates/test_heatapi_keystone_get_token.yml
new file mode 100755
index 0000000..4ee09f9
--- /dev/null
+++ b/src/emuvim/test/unittests/templates/test_heatapi_keystone_get_token.yml
@@ -0,0 +1,31 @@
+---
+# Copyright (c) 2017 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV, Paderborn University
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
+auth:
+  tenantName: demo
+  tenantId: fc394f2ab2df4114bde39905f800dc57
+  token:
+    id: cbc36478b0bd8e67e89469c7749d4127
diff --git a/src/emuvim/test/unittests/templates/test_heatapi_template_create_stack.yml b/src/emuvim/test/unittests/templates/test_heatapi_template_create_stack.yml
new file mode 100755
index 0000000..46fe05d
--- /dev/null
+++ b/src/emuvim/test/unittests/templates/test_heatapi_template_create_stack.yml
@@ -0,0 +1,303 @@
+---
+# Copyright (c) 2017 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV, Paderborn University
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
+template:
+  heat_template_version: '2015-04-30'
+  resources:
+    firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Router
+      properties:
+        name: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Router
+      properties:
+        name: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router: 20790da5-2dc1-4c7e-b9c3-a8d590517563
+        subnet:
+          get_resource: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+stack_name: s1
diff --git a/src/emuvim/test/unittests/templates/test_heatapi_template_update_stack.yml b/src/emuvim/test/unittests/templates/test_heatapi_template_update_stack.yml
new file mode 100755
index 0000000..5a8e8d5
--- /dev/null
+++ b/src/emuvim/test/unittests/templates/test_heatapi_template_update_stack.yml
@@ -0,0 +1,498 @@
+---
+# Copyright (c) 2017 SONATA-NFV and Paderborn University
+# ALL RIGHTS RESERVED.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Neither the name of the SONATA-NFV, Paderborn University
+# nor the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# This work has been performed in the framework of the SONATA project,
+# funded by the European Commission under Grant number 671517 through
+# the Horizon 2020 and 5G-PPP programmes. The authors would like to
+# acknowledge the contributions of their colleagues of the SONATA
+# partner consortium (www.sonata-nfv.eu).
+template:
+  heat_template_version: '2015-04-30'
+  resources:
+    firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    floating:tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::FloatingIP
+      properties:
+        floating_network_id: decd89e2-1681-427e-ac24-6e9f1abb1715
+        port_id:
+          get_resource: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.1.0/29
+        gateway_ip: 192.1.0.1
+        name: loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Router
+      properties:
+        name: sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Router
+      properties:
+        name: sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Router
+      properties:
+        name: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router: 20790da5-2dc1-4c7e-b9c3-a8d590517563
+        subnet:
+          get_resource: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/28
+        gateway_ip: 192.1.0.1
+        name: sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:loadbalancer-2-tcpdump:2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Nova::Server
+      properties:
+        flavor:
+          flavorName: m1.small
+          vcpu: 2
+          ram: 2048
+          storage: 20
+        image: ubuntu:trusty
+        name: tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        networks:
+        - port:
+            get_resource: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        - port:
+            get_resource: tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Port
+      properties:
+        name: tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:loadbalancer-2-tcpdump:3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::RouterInterface
+      properties:
+        router:
+          get_resource: sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        subnet:
+          get_resource: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Net
+      properties:
+        name: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+    tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest:
+      type: OS::Neutron::Subnet
+      properties:
+        cidr: 192.0.2.0/29
+        gateway_ip: 192.1.0.1
+        name: tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+        network:
+          get_resource: tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest
+stack_name: s1
diff --git a/src/emuvim/test/unittests/test_heatapi_keystone_get_token.json b/src/emuvim/test/unittests/test_heatapi_keystone_get_token.json
deleted file mode 100755
index 9eb13c0..0000000
--- a/src/emuvim/test/unittests/test_heatapi_keystone_get_token.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "auth": {
-        "tenantName": "demo",
-        "tenantId": "fc394f2ab2df4114bde39905f800dc57",
-        "token": {
-            "id": "cbc36478b0bd8e67e89469c7749d4127"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/emuvim/test/unittests/test_heatapi_template_chaining.json b/src/emuvim/test/unittests/test_heatapi_template_chaining.json
deleted file mode 100755
index 39a1cb1..0000000
--- a/src/emuvim/test/unittests/test_heatapi_template_chaining.json
+++ /dev/null
@@ -1,425 +0,0 @@
-{
-  "template": {
-    "heat_template_version": "2015-04-30",
-    "resources": {
-      "firewall1": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "firewall1",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "firewall1:cp01:mgmt"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "firewall1:cp02:input"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "firewall1:cp03:output"
-              }
-            }
-          ]
-        }
-      },
-      "firewall1:cp01:mgmt": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp01:mgmt",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net"
-          }
-        }
-      },
-      "firewall1:cp02:input": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp02:input",
-          "network": {
-            "get_resource": "firewall:input:net"
-          }
-        }
-      },
-      "firewall1:cp03:output": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp03:output",
-          "network": {
-            "get_resource": "firewall:output:net"
-          }
-        }
-      },
-      "firewall1:firewall-2-tcpdump:1": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-tcpdump"
-          },
-          "subnet": {
-            "get_resource": "firewall:output:subnet"
-          }
-        }
-      },
-      "firewall1:iperf-2-firewall:1": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall"
-          },
-          "subnet": {
-            "get_resource": "firewall:input:subnet"
-          }
-        }
-      },
-      "firewall:input:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:input:net"
-        }
-      },
-      "firewall:input:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:input:subnet",
-          "network": {
-            "get_resource": "firewall:input:net"
-          }
-        }
-      },
-      "firewall:output:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:output:net"
-        }
-      },
-      "firewall:output:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:output:subnet",
-          "network": {
-            "get_resource": "firewall:output:net"
-          }
-        }
-      },
-      "floating:firewall1:cp01:mgmt": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "firewall1:cp01:mgmt"
-          }
-        }
-      },
-      "floating:iperf1:cp01:mgmt": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "iperf1:cp01:mgmt"
-          }
-        }
-      },
-      "floating:tcpdump1:cp01:mgmt": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "tcpdump1:cp01:mgmt"
-          }
-        }
-      },
-      "iperf1": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "iperf1",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "iperf1:cp01:mgmt"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp02:input"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp03:output"
-              }
-            }
-          ]
-        }
-      },
-      "iperf1:cp01:mgmt": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp01:mgmt",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net"
-          }
-        }
-      },
-      "iperf1:cp02:input": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp02:input",
-          "network": {
-            "get_resource": "iperf:input:net"
-          }
-        }
-      },
-      "iperf1:cp03:output": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp03:output",
-          "network": {
-            "get_resource": "iperf:output:net"
-          }
-        }
-      },
-      "iperf1:input-2-iperf:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf1:input-2-iperf:net"
-        }
-      },
-      "iperf1:input-2-iperf:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf1:input-2-iperf:subnet",
-          "network": {
-            "get_resource": "iperf1:input-2-iperf:net"
-          }
-        }
-      },
-      "iperf1:iperf-2-firewall:1": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall"
-          },
-          "subnet": {
-            "get_resource": "iperf:output:subnet"
-          }
-        }
-      },
-      "iperf:input:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:input:net"
-        }
-      },
-      "iperf:input:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:input:subnet",
-          "network": {
-            "get_resource": "iperf:input:net"
-          }
-        }
-      },
-      "iperf:output:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:output:net"
-        }
-      },
-      "iperf:output:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:output:subnet",
-          "network": {
-            "get_resource": "iperf:output:net"
-          }
-        }
-      },
-      "sonata-demo:firewall-2-tcpdump": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:firewall-2-tcpdump"
-        }
-      },
-      "sonata-demo:iperf-2-firewall": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:iperf-2-firewall"
-        }
-      },
-      "sonata-demo:mgmt:internal": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": "20790da5-2dc1-4c7e-b9c3-a8d590517563",
-          "subnet": {
-            "get_resource": "sonata-demo:mgmt:subnet"
-          }
-        }
-      },
-      "sonata-demo:mgmt:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "sonata-demo:mgmt:net"
-        }
-      },
-      "sonata-demo:mgmt:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "sonata-demo:mgmt:subnet",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net"
-          }
-        }
-      },
-      "tcpdump1": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "tcpdump1",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp01:mgmt"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp02:input"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp03:output"
-              }
-            }
-          ]
-        }
-      },
-      "tcpdump1:cp01:mgmt": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp01:mgmt",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net"
-          }
-        }
-      },
-      "tcpdump1:cp02:input": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp02:input",
-          "network": {
-            "get_resource": "tcpdump:input:net"
-          }
-        }
-      },
-      "tcpdump1:cp03:output": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp03:output",
-          "network": {
-            "get_resource": "tcpdump:output:net"
-          }
-        }
-      },
-      "tcpdump1:firewall-2-tcpdump:1": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-tcpdump"
-          },
-          "subnet": {
-            "get_resource": "tcpdump:input:subnet"
-          }
-        }
-      },
-      "tcpdump1:tcpdump-2-output:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump1:tcpdump-2-output:net"
-        }
-      },
-      "tcpdump1:tcpdump-2-output:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump1:tcpdump-2-output:subnet",
-          "network": {
-            "get_resource": "tcpdump1:tcpdump-2-output:net"
-          }
-        }
-      },
-      "tcpdump:input:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:input:net"
-        }
-      },
-      "tcpdump:input:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:input:subnet",
-          "network": {
-            "get_resource": "tcpdump:input:net"
-          }
-        }
-      },
-      "tcpdump:output:net": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:output:net"
-        }
-      },
-      "tcpdump:output:subnet": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:output:subnet",
-          "network": {
-            "get_resource": "tcpdump:output:net"
-          }
-        }
-      }
-    }
-  },
-  "stack_name": "s1"
-
-}
\ No newline at end of file
diff --git a/src/emuvim/test/unittests/test_heatapi_template_create_stack.json b/src/emuvim/test/unittests/test_heatapi_template_create_stack.json
deleted file mode 100755
index 400b41c..0000000
--- a/src/emuvim/test/unittests/test_heatapi_template_create_stack.json
+++ /dev/null
@@ -1,425 +0,0 @@
-{
-  "template": {
-    "heat_template_version": "2015-04-30",
-    "resources": {
-      "firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": "20790da5-2dc1-4c7e-b9c3-a8d590517563",
-          "subnet": {
-            "get_resource": "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:firewall-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      }
-    }
-  },
-  "stack_name": "s1"
-
-}
\ No newline at end of file
diff --git a/src/emuvim/test/unittests/test_heatapi_template_update_stack.json b/src/emuvim/test/unittests/test_heatapi_template_update_stack.json
deleted file mode 100755
index 432a348..0000000
--- a/src/emuvim/test/unittests/test_heatapi_template_update_stack.json
+++ /dev/null
@@ -1,726 +0,0 @@
-{
-  "template": {
-    "heat_template_version": "2015-04-30",
-    "resources": {
-      "firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "firewall1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "firewall1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "firewall:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "firewall:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "firewall1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "floating:tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::FloatingIP",
-        "properties": {
-          "floating_network_id": "decd89e2-1681-427e-ac24-6e9f1abb1715",
-          "port_id": {
-            "get_resource": "tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "iperf1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "iperf1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf1:input-2-iperf:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf1:input-2-iperf:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf1:iperf-2-firewall:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "iperf:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "iperf:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "loadbalancer1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "loadbalancer1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "loadbalancer1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "loadbalancer1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer1:firewall-2-loadbalancer:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "loadbalancer:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "loadbalancer:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.1.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "loadbalancer:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "loadbalancer:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:firewall-2-loadbalancer:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:iperf-2-firewall:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Router",
-        "properties": {
-          "name": "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:mgmt:internal:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": "20790da5-2dc1-4c7e-b9c3-a8d590517563",
-          "subnet": {
-            "get_resource": "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/28",
-          "gateway_ip": "192.1.0.1",
-          "name": "sonata-demo:mgmt:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "tcpdump1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump1:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:loadbalancer-2-tcpdump:1:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump1:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump1:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "tcpdump2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump2:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump2:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump2:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump2:loadbalancer-2-tcpdump:2:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump2:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump2:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Nova::Server",
-        "properties": {
-          "flavor": {
-            "flavorName": "m1.small",
-            "vcpu": 2,
-            "ram": 2048,
-            "storage": 20
-          },
-          "image": "ubuntu:trusty",
-          "name": "tcpdump3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "networks": [
-            {
-              "port": {
-                "get_resource": "tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            },
-            {
-              "port": {
-                "get_resource": "tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-              }
-            }
-          ]
-        }
-      },
-      "tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump3:cp01:mgmt:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "sonata-demo:mgmt:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump3:cp02:input:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Port",
-        "properties": {
-          "name": "tcpdump3:cp03:output:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump3:loadbalancer-2-tcpdump:3:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::RouterInterface",
-        "properties": {
-          "router": {
-            "get_resource": "sonata-demo:loadbalancer-2-tcpdump:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          },
-          "subnet": {
-            "get_resource": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump3:tcpdump-2-output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump3:tcpdump-2-output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:input:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:input:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      },
-      "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Net",
-        "properties": {
-          "name": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-        }
-      },
-      "tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest": {
-        "type": "OS::Neutron::Subnet",
-        "properties": {
-          "cidr": "192.0.2.0/29",
-          "gateway_ip": "192.1.0.1",
-          "name": "tcpdump:output:subnet:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest",
-          "network": {
-            "get_resource": "tcpdump:output:net:9df6a98f-9e11-4cb7-b3c0-InAdUnitTest"
-          }
-        }
-      }
-    }
-  },
-  "stack_name": "s1"
-}
\ No newline at end of file
diff --git a/src/emuvim/test/unittests/test_openstack.py b/src/emuvim/test/unittests/test_openstack.py
index 1e43a75..3e9037a 100755
--- a/src/emuvim/test/unittests/test_openstack.py
+++ b/src/emuvim/test/unittests/test_openstack.py
@@ -34,6 +34,7 @@
 import unittest
 import requests
 import simplejson as json
+import yaml
 import time
 
 from emuvim.test.api_base_openstack import ApiBaseOpenStack
@@ -65,9 +66,9 @@
         print(" ")
 
         headers = {'Content-type': 'application/json'}
-        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "test_heatapi_template_create_stack.json")).read()
+        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "templates/test_heatapi_template_create_stack.yml")).read()
         url = "http://0.0.0.0:18004/v1/tenantabc123/stacks"
-        requests.post(url, data=json.dumps(json.loads(test_heatapi_template_create_stack)),
+        requests.post(url, data=json.dumps(yaml.load(test_heatapi_template_create_stack)),
                       headers=headers)
 
         print('->>>>>>> test Nova List Versions ->>>>>>>>>>>>>>>')
@@ -266,9 +267,9 @@
         print(" ")
 
         headers = {'Content-type': 'application/json'}
-        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "test_heatapi_template_create_stack.json")).read()
+        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "templates/test_heatapi_template_create_stack.yml")).read()
         url = "http://0.0.0.0:18004/v1/tenantabc123/stacks"
-        requests.post(url, data=json.dumps(json.loads(test_heatapi_template_create_stack)), headers=headers)
+        requests.post(url, data=json.dumps(yaml.load(test_heatapi_template_create_stack)), headers=headers)
         # test_heatapi_keystone_get_token = open("test_heatapi_keystone_get_token.json").read()
 
         print('->>>>>>> test Neutron List Versions ->>>>>>>>>>>>>>>')
@@ -620,7 +621,7 @@
         print(" ")
 
         headers = {'Content-type': 'application/json'}
-        test_heatapi_keystone_get_token = open(os.path.join(os.path.dirname(__file__), "test_heatapi_keystone_get_token.json")).read()
+        test_heatapi_keystone_get_token = open(os.path.join(os.path.dirname(__file__), "templates/test_heatapi_keystone_get_token.yml")).read()
 
         print('->>>>>>> test Keystone List Versions ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
@@ -641,7 +642,7 @@
         print('->>>>>>> test Keystone Get Token ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         url = "http://0.0.0.0:15000/v2.0/tokens"
-        gettokenstackresponse = requests.post(url, data=json.dumps(json.loads(test_heatapi_keystone_get_token)), headers=headers)
+        gettokenstackresponse = requests.post(url, data=json.dumps(yaml.load(test_heatapi_keystone_get_token)), headers=headers)
         self.assertEqual(gettokenstackresponse.status_code, 200)
         self.assertEqual(json.loads(gettokenstackresponse.content)["access"]["user"]["name"], "tenantName")
         print(" ")
@@ -652,8 +653,8 @@
         print(" ")
 
         headers = {'Content-type': 'application/json'}
-        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "test_heatapi_template_create_stack.json")).read()
-        test_heatapi_template_update_stack = open(os.path.join(os.path.dirname(__file__), "test_heatapi_template_update_stack.json")).read()
+        test_heatapi_template_create_stack = open(os.path.join(os.path.dirname(__file__), "templates/test_heatapi_template_create_stack.yml")).read()
+        test_heatapi_template_update_stack = open(os.path.join(os.path.dirname(__file__), "templates/test_heatapi_template_update_stack.yml")).read()
 
         print('->>>>>>> test Heat List API Versions Stack ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
@@ -666,7 +667,7 @@
         print('->>>>>>> test Create Stack ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         url = "http://0.0.0.0:18004/v1/tenantabc123/stacks"
-        createstackresponse = requests.post(url, data=json.dumps(json.loads(test_heatapi_template_create_stack)), headers=headers)
+        createstackresponse = requests.post(url, data=json.dumps(yaml.load(test_heatapi_template_create_stack)), headers=headers)
         self.assertEqual(createstackresponse.status_code, 201)
         self.assertNotEqual(json.loads(createstackresponse.content)["stack"]["id"], "")
         print(" ")
@@ -713,7 +714,7 @@
         print('->>>>>>> test Update Stack ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         url = "http://0.0.0.0:18004/v1/tenantabc123updateStack/stacks/%s"% json.loads(createstackresponse.content)['stack']['id']
-        updatestackresponse = requests.put(url, data=json.dumps(json.loads(test_heatapi_template_update_stack)),
+        updatestackresponse = requests.put(url, data=json.dumps(yaml.load(test_heatapi_template_update_stack)),
                                             headers=headers)
         self.assertEqual(updatestackresponse.status_code, 202)
         liststackdetailsresponse = requests.get(url, headers=headers)
diff --git a/src/emuvim/test/unittests/test_restapi.py b/src/emuvim/test/unittests/test_restapi.py
index 5bc071a..4ea8008 100755
--- a/src/emuvim/test/unittests/test_restapi.py
+++ b/src/emuvim/test/unittests/test_restapi.py
@@ -58,16 +58,16 @@
         # start Mininet network
         self.startNet()
 
-        print('->>>>>>> son-emu-cli compute start -d datacenter0 -n vnf1 ->>>>>>>>>>>>>>>')
+        print('->>>>>>> vim-emu compute start -d datacenter0 -n vnf1 ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        subprocess.call("son-emu-cli compute start -d datacenter0 -n vnf1", shell=True)
-        print('->>>>>>> son-emu-cli compute start -d datacenter0 -n vnf2 ->>>>>>>>>>>>>>>')
+        subprocess.call("vim-emu compute start -d datacenter0 -n vnf1", shell=True)
+        print('->>>>>>> vim-emu compute start -d datacenter0 -n vnf2 ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        subprocess.call("son-emu-cli compute start -d datacenter0 -n vnf2", shell=True)
-        print('->>>>>>> son-emu-cli compute start -d datacenter0 -n vnf3 ->>>>>>>>>>>>>>>')
+        subprocess.call("vim-emu compute start -d datacenter0 -n vnf2", shell=True)
+        print('->>>>>>> vim-emu compute start -d datacenter0 -n vnf3 ->>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        subprocess.call("son-emu-cli compute start -d datacenter1 -n vnf3", shell=True)
-        subprocess.call("son-emu-cli compute list", shell=True)
+        subprocess.call("vim-emu compute start -d datacenter1 -n vnf3", shell=True)
+        subprocess.call("vim-emu compute list", shell=True)
         print('->>>>>>> checking running nodes, compute list, and connectivity >>>>>>>>>>')
 
         # check number of running nodes
@@ -92,19 +92,19 @@
 
         print('network add vnf1 vnf2->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli network add -src vnf1 -dst vnf2 -b -c 10", shell=True)
+        output = subprocess.check_output("vim-emu network add -src vnf1 -dst vnf2 -b -c 10", shell=True)
         self.assertTrue("add-flow" in output)
         self.assertTrue("success" in output)
 
         print('network remove vnf1 vnf2->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli network remove -src vnf1 -dst vnf2 -b", shell=True)
+        output = subprocess.check_output("vim-emu network remove -src vnf1 -dst vnf2 -b", shell=True)
         self.assertTrue("del-flows" in output)
         self.assertTrue("success" in output)
 
-        print('>>>>> checking --> son-emu-cli compute stop -d datacenter0 -n vnf2 ->>>>>>')
+        print('>>>>> checking --> vim-emu compute stop -d datacenter0 -n vnf2 ->>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli compute stop -d datacenter0 -n vnf2", shell=True)
+        output = subprocess.check_output("vim-emu compute stop -d datacenter0 -n vnf2", shell=True)
 
         # check number of running nodes
         self.assertTrue(len(self.getContainernetContainers()) == 2)
@@ -114,31 +114,31 @@
         self.assertTrue(len(self.dc[0].listCompute()) == 1)
         self.assertTrue(len(self.dc[1].listCompute()) == 1)
 
-        print('>>>>> checking --> son-emu-cli compute list ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
+        print('>>>>> checking --> vim-emu compute list ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli compute list", shell=True)
+        output = subprocess.check_output("vim-emu compute list", shell=True)
 
         # check datacenter list result
         self.assertTrue("datacenter0" in output)
 
-        print('>>>>> checking --> son-emu-cli compute status -d datacenter0 -n vnf1 ->>>>')
+        print('>>>>> checking --> vim-emu compute status -d datacenter0 -n vnf1 ->>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli compute status -d datacenter0 -n vnf1", shell=True)
+        output = subprocess.check_output("vim-emu compute status -d datacenter0 -n vnf1", shell=True)
         output = ast.literal_eval(output)
 
         # check compute status result
         self.assertTrue(output["name"] == "vnf1")
         self.assertTrue(output["state"]["Running"])
 
-        print('>>>>> checking --> son-emu-cli datacenter list ->>>>>>>>>>>>>>>>>>>>>>>>>>')
+        print('>>>>> checking --> vim-emu datacenter list ->>>>>>>>>>>>>>>>>>>>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli datacenter list", shell=True)
+        output = subprocess.check_output("vim-emu datacenter list", shell=True)
         # check datacenter list result
         self.assertTrue("datacenter0" in output)
 
-        print('->>>>> checking --> son-emu-cli datacenter status -d datacenter0 ->>>>>>>>')
+        print('->>>>> checking --> vim-emu datacenter status -d datacenter0 ->>>>>>>>')
         print('->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-        output = subprocess.check_output("son-emu-cli datacenter status -d datacenter0", shell=True)
+        output = subprocess.check_output("vim-emu datacenter status -d datacenter0", shell=True)
         # check datacenter status result
         self.assertTrue("datacenter0" in output)
         self.stopApi()
diff --git a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index 9cdccac..3450ce9 100755
--- a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@ -208,7 +208,7 @@
         initialize_GK()
 
 
-    #@unittest.skip("disabled")
+    @unittest.skip("disabled")
     def test_GK_stress_service(self):
         # create network
         self.createNet(ndatacenter=2, nhosts=2)