v0.4.60: fixed bug when using ip profiles in openstack, improved logs in case od unexpected exception in REST API, dos2unix vnf examples

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/vnfs/examples/dataplaneVNF1.yaml b/vnfs/examples/dataplaneVNF1.yaml
index 3d70230..7420604 100644
--- a/vnfs/examples/dataplaneVNF1.yaml
+++ b/vnfs/examples/dataplaneVNF1.yaml
@@ -1,81 +1,81 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-vnf:

-    name:        dataplaneVNF1

-    description: "Example of a dataplane VNF consisting of a single VM for data plane workloads with high I/O performance requirements: 14 HW threads, 16 GB hugepages and 4 10G interfaces"

-    external-connections:

-    -   name:              mgmt

-        type:              mgmt       # "mgmt"(autoconnect to management net)

-        VNFC:              dataplaneVNF1-VM

-        local_iface_name:  eth0

-        description:       Management interface for general use

-    -   name:              xe0

-        type:              data

-        VNFC:              dataplaneVNF1-VM

-        local_iface_name:  xe0

-        description:       Dataplane interface 1

-    -   name:              xe1

-        type:              data

-        VNFC:              dataplaneVNF1-VM

-        local_iface_name:  xe1

-        description:       Dataplane interface 2

-    -   name:              xe2

-        type:              data

-        VNFC:              dataplaneVNF1-VM

-        local_iface_name:  xe2

-        description:       Dataplane interface 3

-    -   name:              xe3

-        type:              data

-        VNFC:              dataplaneVNF1-VM

-        local_iface_name:  xe3

-        description:       Dataplane interface 4

-    VNFC:

-    -   name:        dataplaneVNF1-VM

-        description: "Dataplane VM with high I/O performance requirements: 14 HW threads, 16 GB hugepages and 4 10G interfaces"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF1.qcow2

-        numas: 

-        -   paired-threads: 7          # "cores", "paired-threads", "threads"

-            paired-threads-id: [ [0,1], [2,3], [4,5], [6,7], [8,9], [10,11], [12, 13] ]

-            memory: 16                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "yes"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 10 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "yes"

-                bandwidth: 10 Gbps

-            -   name:      xe2

-                vpci:      "0000:00:13.0"

-                dedicated: "yes"

-                bandwidth: 10 Gbps

-            -   name:      xe3

-                vpci:      "0000:00:14.0"

-                dedicated: "yes"

-                bandwidth: 10 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+vnf:
+    name:        dataplaneVNF1
+    description: "Example of a dataplane VNF consisting of a single VM for data plane workloads with high I/O performance requirements: 14 HW threads, 16 GB hugepages and 4 10G interfaces"
+    external-connections:
+    -   name:              mgmt
+        type:              mgmt       # "mgmt"(autoconnect to management net)
+        VNFC:              dataplaneVNF1-VM
+        local_iface_name:  eth0
+        description:       Management interface for general use
+    -   name:              xe0
+        type:              data
+        VNFC:              dataplaneVNF1-VM
+        local_iface_name:  xe0
+        description:       Dataplane interface 1
+    -   name:              xe1
+        type:              data
+        VNFC:              dataplaneVNF1-VM
+        local_iface_name:  xe1
+        description:       Dataplane interface 2
+    -   name:              xe2
+        type:              data
+        VNFC:              dataplaneVNF1-VM
+        local_iface_name:  xe2
+        description:       Dataplane interface 3
+    -   name:              xe3
+        type:              data
+        VNFC:              dataplaneVNF1-VM
+        local_iface_name:  xe3
+        description:       Dataplane interface 4
+    VNFC:
+    -   name:        dataplaneVNF1-VM
+        description: "Dataplane VM with high I/O performance requirements: 14 HW threads, 16 GB hugepages and 4 10G interfaces"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF1.qcow2
+        numas: 
+        -   paired-threads: 7          # "cores", "paired-threads", "threads"
+            paired-threads-id: [ [0,1], [2,3], [4,5], [6,7], [8,9], [10,11], [12, 13] ]
+            memory: 16                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "yes"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 10 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "yes"
+                bandwidth: 10 Gbps
+            -   name:      xe2
+                vpci:      "0000:00:13.0"
+                dedicated: "yes"
+                bandwidth: 10 Gbps
+            -   name:      xe3
+                vpci:      "0000:00:14.0"
+                dedicated: "yes"
+                bandwidth: 10 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
diff --git a/vnfs/examples/dataplaneVNF2.yaml b/vnfs/examples/dataplaneVNF2.yaml
index 6760ed7..f03c208 100644
--- a/vnfs/examples/dataplaneVNF2.yaml
+++ b/vnfs/examples/dataplaneVNF2.yaml
@@ -1,79 +1,79 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-vnf:

-    name:        dataplaneVNF2

-    description: "Example of a dataplane VNF consisting of a single VM for data plane workloads with high I/O performance requirements: 3 cores, 8 GB hugepages, 2 10G interfaces and 1 SR-IOV interface"

-    external-connections:

-    -   name:              mgmt

-        type:              mgmt       # "mgmt"(autoconnect to management net)

-        VNFC:              dataplaneVNF2-VM

-        local_iface_name:  eth0

-        description:       Management interface for general use

-    -   name:              control

-        type:              bridge

-        VNFC:              dataplaneVNF2-VM

-        local_iface_name:  eth1

-        description:       Bridge interface

-    -   name:              xe0

-        type:              data

-        VNFC:              dataplaneVNF2-VM

-        local_iface_name:  xe0

-        description:       Dataplane interface 1

-    -   name:              xe1

-        type:              data

-        VNFC:              dataplaneVNF2-VM

-        local_iface_name:  xe1

-        description:       Dataplane interface 2

-    -   name:              xe2

-        type:              data

-        VNFC:              dataplaneVNF2-VM

-        local_iface_name:  xe2

-        description:       Dataplane interface 3 (SR-IOV)

-    VNFC:

-    -   name:        dataplaneVNF2-VM

-        description: "Dataplane VM with high I/O performance requirements: 3 cores (no hyperthreading), 8 GB hugepages, 2 10G interfaces and 1 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF2.qcow2

-        numas: 

-        -   cores: 3          # "cores", "paired-threads", "threads"

-            memory: 8                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "yes"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 10 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "yes"

-                bandwidth: 10 Gbps

-            -   name:      xe2

-                vpci:      "0000:00:13.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-        -   name:      eth1

-            vpci:      "0000:00:10.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+vnf:
+    name:        dataplaneVNF2
+    description: "Example of a dataplane VNF consisting of a single VM for data plane workloads with high I/O performance requirements: 3 cores, 8 GB hugepages, 2 10G interfaces and 1 SR-IOV interface"
+    external-connections:
+    -   name:              mgmt
+        type:              mgmt       # "mgmt"(autoconnect to management net)
+        VNFC:              dataplaneVNF2-VM
+        local_iface_name:  eth0
+        description:       Management interface for general use
+    -   name:              control
+        type:              bridge
+        VNFC:              dataplaneVNF2-VM
+        local_iface_name:  eth1
+        description:       Bridge interface
+    -   name:              xe0
+        type:              data
+        VNFC:              dataplaneVNF2-VM
+        local_iface_name:  xe0
+        description:       Dataplane interface 1
+    -   name:              xe1
+        type:              data
+        VNFC:              dataplaneVNF2-VM
+        local_iface_name:  xe1
+        description:       Dataplane interface 2
+    -   name:              xe2
+        type:              data
+        VNFC:              dataplaneVNF2-VM
+        local_iface_name:  xe2
+        description:       Dataplane interface 3 (SR-IOV)
+    VNFC:
+    -   name:        dataplaneVNF2-VM
+        description: "Dataplane VM with high I/O performance requirements: 3 cores (no hyperthreading), 8 GB hugepages, 2 10G interfaces and 1 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF2.qcow2
+        numas: 
+        -   cores: 3          # "cores", "paired-threads", "threads"
+            memory: 8                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "yes"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 10 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "yes"
+                bandwidth: 10 Gbps
+            -   name:      xe2
+                vpci:      "0000:00:13.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+        -   name:      eth1
+            vpci:      "0000:00:10.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
diff --git a/vnfs/examples/dataplaneVNF3.yaml b/vnfs/examples/dataplaneVNF3.yaml
index 73d2cf9..87e90e1 100644
--- a/vnfs/examples/dataplaneVNF3.yaml
+++ b/vnfs/examples/dataplaneVNF3.yaml
@@ -1,65 +1,65 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-vnf:

-    name:        dataplaneVNF3

-    description: "Example of a dataplane VNF consisting of one VM with two SR-IOV"

-    # class: parent      # Optional. Used to organize VNFs

-    external-connections:

-    -   name:              mgmt

-        type:              mgmt

-        VNFC:              dataplaneVNF3-VM

-        local_iface_name:  eth0

-        description:       control interface VM1

-    -   name:              data0

-        type:              data

-        VNFC:              dataplaneVNF3-VM

-        local_iface_name:  xe0

-        description:       Dataplane interface

-    -   name:              data1

-        type:              data

-        VNFC:              dataplaneVNF3-VM

-        local_iface_name:  xe1

-        description:       Dataplane interface

-    VNFC:

-    -   name:        dataplaneVNF3-VM

-        description: "Dataplane VM with 2 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF3.qcow2

-        disk: 10

-        numas: 

-        -   threads: 2         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+vnf:
+    name:        dataplaneVNF3
+    description: "Example of a dataplane VNF consisting of one VM with two SR-IOV"
+    # class: parent      # Optional. Used to organize VNFs
+    external-connections:
+    -   name:              mgmt
+        type:              mgmt
+        VNFC:              dataplaneVNF3-VM
+        local_iface_name:  eth0
+        description:       control interface VM1
+    -   name:              data0
+        type:              data
+        VNFC:              dataplaneVNF3-VM
+        local_iface_name:  xe0
+        description:       Dataplane interface
+    -   name:              data1
+        type:              data
+        VNFC:              dataplaneVNF3-VM
+        local_iface_name:  xe1
+        description:       Dataplane interface
+    VNFC:
+    -   name:        dataplaneVNF3-VM
+        description: "Dataplane VM with 2 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF3.qcow2
+        disk: 10
+        numas: 
+        -   threads: 2         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
+
diff --git a/vnfs/examples/dataplaneVNF_2VMs.yaml b/vnfs/examples/dataplaneVNF_2VMs.yaml
index 1e468fe..8871270 100644
--- a/vnfs/examples/dataplaneVNF_2VMs.yaml
+++ b/vnfs/examples/dataplaneVNF_2VMs.yaml
@@ -1,100 +1,100 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-vnf:

-    name:        dataplaneVNF_2VMs

-    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"

-    # class: parent      # Optional. Used to organize VNFs

-    internal-connections:

-    -   name:        datanet

-        description: datanet

-        type:        data

-        elements:

-        -   VNFC:             VNF_2VMs-VM1

-            local_iface_name: xe0

-        -   VNFC:             VNF_2VMs-VM2

-            local_iface_name: xe0

-    external-connections:

-    -   name:              control0

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  eth0

-        description:       control interface VM1

-    -   name:              control1

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  eth0

-        description:       control interface VM2

-    -   name:              in

-        type:              data

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  xe1

-        description:       Dataplane interface input

-    -   name:              out

-        type:              data

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  xe1

-        description:       Dataplane interface output

-    VNFC:

-    -   name:        VNF_2VMs-VM1

-        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2

-        disk: 10

-        numas: 

-        -   paired-threads: 2         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

-    -   name:        VNF_2VMs-VM2

-        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2

-        disk: 10

-        numas: 

-        -   paired-threads: 1         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+vnf:
+    name:        dataplaneVNF_2VMs
+    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"
+    # class: parent      # Optional. Used to organize VNFs
+    internal-connections:
+    -   name:        datanet
+        description: datanet
+        type:        data
+        elements:
+        -   VNFC:             VNF_2VMs-VM1
+            local_iface_name: xe0
+        -   VNFC:             VNF_2VMs-VM2
+            local_iface_name: xe0
+    external-connections:
+    -   name:              control0
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  eth0
+        description:       control interface VM1
+    -   name:              control1
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  eth0
+        description:       control interface VM2
+    -   name:              in
+        type:              data
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  xe1
+        description:       Dataplane interface input
+    -   name:              out
+        type:              data
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  xe1
+        description:       Dataplane interface output
+    VNFC:
+    -   name:        VNF_2VMs-VM1
+        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2
+        disk: 10
+        numas: 
+        -   paired-threads: 2         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
+    -   name:        VNF_2VMs-VM2
+        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2
+        disk: 10
+        numas: 
+        -   paired-threads: 1         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
diff --git a/vnfs/examples/dataplaneVNF_2VMs_v02.yaml b/vnfs/examples/dataplaneVNF_2VMs_v02.yaml
index dbd5bd1..bd80761 100644
--- a/vnfs/examples/dataplaneVNF_2VMs_v02.yaml
+++ b/vnfs/examples/dataplaneVNF_2VMs_v02.yaml
@@ -1,113 +1,113 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-schema_version: "0.2"

-vnf:

-    name:        dataplaneVNF_2VMs_v02

-    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"

-    # class: parent      # Optional. Used to organize VNFs

-    internal-connections:

-    -   name:        datanet

-        description: datanet

-        type:        e-lan

-        implementation: underlay

-        ip-profile:

-            ip-version:       IPv4

-            subnet-address:   192.168.1.0/24

-            gateway-address:  192.168.1.1

-            dns-address:      8.8.8.8

-            dhcp:

-                enabled: true

-                start-address: 192.168.1.100

-                count: 100

-        elements:

-        -   VNFC:             VNF_2VMs-VM1

-            local_iface_name: xe0

-            ip_address:       192.168.1.2

-        -   VNFC:             VNF_2VMs-VM2

-            local_iface_name: xe0

-            ip_address:       192.168.1.3

-    external-connections:

-    -   name:              control0

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  eth0

-        description:       control interface VM1

-    -   name:              control1

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  eth0

-        description:       control interface VM2

-    -   name:              in

-        type:              data

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  xe1

-        description:       Dataplane interface input

-    -   name:              out

-        type:              data

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  xe1

-        description:       Dataplane interface output

-    VNFC:

-    -   name:        VNF_2VMs-VM1

-        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2

-        disk: 10

-        numas: 

-        -   paired-threads: 2         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

-    -   name:        VNF_2VMs-VM2

-        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2

-        disk: 10

-        numas: 

-        -   paired-threads: 1         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+schema_version: "0.2"
+vnf:
+    name:        dataplaneVNF_2VMs_v02
+    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"
+    # class: parent      # Optional. Used to organize VNFs
+    internal-connections:
+    -   name:        datanet
+        description: datanet
+        type:        e-lan
+        implementation: underlay
+        ip-profile:
+            ip-version:       IPv4
+            subnet-address:   192.168.1.0/24
+            gateway-address:  192.168.1.1
+            dns-address:      8.8.8.8
+            dhcp:
+                enabled: true
+                start-address: 192.168.1.100
+                count: 100
+        elements:
+        -   VNFC:             VNF_2VMs-VM1
+            local_iface_name: xe0
+            ip_address:       192.168.1.2
+        -   VNFC:             VNF_2VMs-VM2
+            local_iface_name: xe0
+            ip_address:       192.168.1.3
+    external-connections:
+    -   name:              control0
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  eth0
+        description:       control interface VM1
+    -   name:              control1
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  eth0
+        description:       control interface VM2
+    -   name:              in
+        type:              data
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  xe1
+        description:       Dataplane interface input
+    -   name:              out
+        type:              data
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  xe1
+        description:       Dataplane interface output
+    VNFC:
+    -   name:        VNF_2VMs-VM1
+        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2
+        disk: 10
+        numas: 
+        -   paired-threads: 2         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
+    -   name:        VNF_2VMs-VM2
+        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/dataplaneVNF_2VMs.qcow2
+        disk: 10
+        numas: 
+        -   paired-threads: 1         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
diff --git a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml b/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml
index 0c54652..674f36c 100644
--- a/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml
+++ b/vnfs/examples/dataplaneVNF_2VMs_v02_withimagename.yaml
@@ -1,113 +1,113 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-schema_version: "0.2"

-vnf:

-    name:        dataplaneVNF_2VMs_v02_withimagename

-    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"

-    # class: parent      # Optional. Used to organize VNFs

-    internal-connections:

-    -   name:        datanet

-        description: datanet

-        type:        e-lan

-        implementation: underlay

-        ip-profile:

-            ip-version:       IPv4

-            subnet-address:   192.168.1.0/24

-            gateway-address:  192.168.1.1

-            dns-address:      8.8.8.8

-            dhcp:

-                enabled: true

-                start-address: 192.168.1.100

-                count: 100

-        elements:

-        -   VNFC:             VNF_2VMs-VM1

-            local_iface_name: xe0

-            ip_address:       192.168.1.2

-        -   VNFC:             VNF_2VMs-VM2

-            local_iface_name: xe0

-            ip_address:       192.168.1.3

-    external-connections:

-    -   name:              control0

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  eth0

-        description:       control interface VM1

-    -   name:              control1

-        type:              mgmt

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  eth0

-        description:       control interface VM2

-    -   name:              in

-        type:              data

-        VNFC:              VNF_2VMs-VM1

-        local_iface_name:  xe1

-        description:       Dataplane interface input

-    -   name:              out

-        type:              data

-        VNFC:              VNF_2VMs-VM2

-        local_iface_name:  xe1

-        description:       Dataplane interface output

-    VNFC:

-    -   name:        VNF_2VMs-VM1

-        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        image name: dataplaneVNF_2VMs-image

-        disk: 10

-        numas: 

-        -   paired-threads: 2         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

-    -   name:        VNF_2VMs-VM2

-        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"

-        #Copy the image to a compute path and edit this path

-        image name: dataplaneVNF_2VMs-image

-        disk: 10

-        numas: 

-        -   paired-threads: 1         # "cores", "paired-threads", "threads"

-            memory: 2                 # GBytes

-            interfaces:

-            -   name:      xe0

-                vpci:      "0000:00:11.0"

-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)

-                bandwidth: 1 Gbps

-            -   name:      xe1

-                vpci:      "0000:00:12.0"

-                dedicated: "no"

-                bandwidth: 1 Gbps

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+schema_version: "0.2"
+vnf:
+    name:        dataplaneVNF_2VMs_v02_withimagename
+    description: "Example of a dataplane VNF consisting of two VMs for data plane workloads with one internal network"
+    # class: parent      # Optional. Used to organize VNFs
+    internal-connections:
+    -   name:        datanet
+        description: datanet
+        type:        e-lan
+        implementation: underlay
+        ip-profile:
+            ip-version:       IPv4
+            subnet-address:   192.168.1.0/24
+            gateway-address:  192.168.1.1
+            dns-address:      8.8.8.8
+            dhcp:
+                enabled: true
+                start-address: 192.168.1.100
+                count: 100
+        elements:
+        -   VNFC:             VNF_2VMs-VM1
+            local_iface_name: xe0
+            ip_address:       192.168.1.2
+        -   VNFC:             VNF_2VMs-VM2
+            local_iface_name: xe0
+            ip_address:       192.168.1.3
+    external-connections:
+    -   name:              control0
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  eth0
+        description:       control interface VM1
+    -   name:              control1
+        type:              mgmt
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  eth0
+        description:       control interface VM2
+    -   name:              in
+        type:              data
+        VNFC:              VNF_2VMs-VM1
+        local_iface_name:  xe1
+        description:       Dataplane interface input
+    -   name:              out
+        type:              data
+        VNFC:              VNF_2VMs-VM2
+        local_iface_name:  xe1
+        description:       Dataplane interface output
+    VNFC:
+    -   name:        VNF_2VMs-VM1
+        description: "Dataplane VM1 with 4 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        image name: dataplaneVNF_2VMs-image
+        disk: 10
+        numas: 
+        -   paired-threads: 2         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
+    -   name:        VNF_2VMs-VM2
+        description: "Dataplane VM1 with 2 threads, 2 GB hugepages, 2 SR-IOV interface"
+        #Copy the image to a compute path and edit this path
+        image name: dataplaneVNF_2VMs-image
+        disk: 10
+        numas: 
+        -   paired-threads: 1         # "cores", "paired-threads", "threads"
+            memory: 2                 # GBytes
+            interfaces:
+            -   name:      xe0
+                vpci:      "0000:00:11.0"
+                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)
+                bandwidth: 1 Gbps
+            -   name:      xe1
+                vpci:      "0000:00:12.0"
+                dedicated: "no"
+                bandwidth: 1 Gbps
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+
diff --git a/vnfs/examples/linux.yaml b/vnfs/examples/linux.yaml
index 796873f..a80b71a 100644
--- a/vnfs/examples/linux.yaml
+++ b/vnfs/examples/linux.yaml
@@ -1,43 +1,43 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-vnf:

-    name:        linux

-    description: Single-VM VNF with a traditional cloud VM based on generic Linux OS

-    external-connections:

-    -   name:              eth0

-        type:              bridge

-        VNFC:              linux-VM

-        local_iface_name:  eth0

-        description:       General purpose interface

-    VNFC:

-    -   name:        linux-VM

-        description: Generic Linux Virtual Machine

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/linux.qcow2

-        vcpus: 1          # Only for traditional cloud VMs. Number of virtual CPUs (oversubscription is allowed).

-        ram: 1024         # Only for traditional cloud VMs. Memory in MBytes (not from hugepages, oversubscription is allowed)

-        disk: 10

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:11.0"

-        numas: []

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+vnf:
+    name:        linux
+    description: Single-VM VNF with a traditional cloud VM based on generic Linux OS
+    external-connections:
+    -   name:              eth0
+        type:              bridge
+        VNFC:              linux-VM
+        local_iface_name:  eth0
+        description:       General purpose interface
+    VNFC:
+    -   name:        linux-VM
+        description: Generic Linux Virtual Machine
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/linux.qcow2
+        vcpus: 1          # Only for traditional cloud VMs. Number of virtual CPUs (oversubscription is allowed).
+        ram: 1024         # Only for traditional cloud VMs. Memory in MBytes (not from hugepages, oversubscription is allowed)
+        disk: 10
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:11.0"
+        numas: []
+
diff --git a/vnfs/examples/linux_2VMs_v02.yaml b/vnfs/examples/linux_2VMs_v02.yaml
index 41b5982..fa1874b 100644
--- a/vnfs/examples/linux_2VMs_v02.yaml
+++ b/vnfs/examples/linux_2VMs_v02.yaml
@@ -1,104 +1,104 @@
-##

-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.

-# This file is part of openmano

-# 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.

-#

-# For those usages not covered by the Apache License, Version 2.0 please

-# contact with: nfvlabs@tid.es

-##

----

-schema_version: "0.2"

-vnf:

-    name:        linux_2VMs_v02

-    description: "Example of a linux VNF consisting of two VMs with one internal network"

-    # class: parent      # Optional. Used to organize VNFs

-    internal-connections:

-    -   name:        internalnet

-        description: internalnet

-        type:        e-lan

-        implementation: overlay

-        ip-profile:

-            ip-version:       IPv4

-            subnet-address:   192.168.1.0/24

-            gateway-address:  192.168.1.1

-            dns-address:      8.8.8.8

-            dhcp:

-                enabled: true

-                start-address: 192.168.1.100

-                count: 100

-        elements:

-        -   VNFC:             linux_2VMs-VM1

-            local_iface_name: xe0

-            ip_address:       192.168.1.2

-        -   VNFC:             linux_2VMs-VM2

-            local_iface_name: xe0

-            ip_address:       192.168.1.3

-    external-connections:

-    -   name:              control0

-        type:              mgmt

-        VNFC:              linux_2VMs-VM1

-        local_iface_name:  eth0

-        description:       control interface VM1

-    -   name:              control1

-        type:              mgmt

-        VNFC:              linux_2VMs-VM2

-        local_iface_name:  eth0

-        description:       control interface VM2

-    -   name:              in

-        type:              bridge

-        VNFC:              linux_2VMs-VM1

-        local_iface_name:  xe1

-        description:       data interface input

-    -   name:              out

-        type:              bridge

-        VNFC:              linux_2VMs-VM2

-        local_iface_name:  xe1

-        description:       data interface output

-    VNFC:

-    -   name:        linux_2VMs-VM1

-        description: "Linux VM1 with 4 CPUs, 2 GB RAM and 3 bridge interfaces"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/linux_VNF_2VMs.qcow2

-        disk: 10

-        vcpus: 4

-        ram: 2048

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-        -   name: xe0

-            vpci:      "0000:00:11.0"

-            bandwidth: 1 Mbps

-        -   name: xe1

-            vpci:      "0000:00:12.0"

-            bandwidth: 1 Mbps

-    -   name:        linux_2VMs-VM2

-        description: "Linux VM2 with 2 CPUs, 2 GB RAM and 3 bridge interfaces"

-        #Copy the image to a compute path and edit this path

-        VNFC image:  /path/to/imagefolder/linux_VNF_2VMs.qcow2

-        disk: 10

-        vcpus: 2

-        ram: 2048

-        bridge-ifaces:

-        -   name:      eth0

-            vpci:      "0000:00:09.0"

-            bandwidth: 1 Mbps          # Optional, informative only

-        -   name: xe0

-            vpci:      "0000:00:11.0"

-            bandwidth: 1 Mbps

-        -   name: xe1

-            vpci:      "0000:00:12.0"

-            bandwidth: 1 Mbps

-

+##
+# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openmano
+# 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.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: nfvlabs@tid.es
+##
+---
+schema_version: "0.2"
+vnf:
+    name:        linux_2VMs_v02
+    description: "Example of a linux VNF consisting of two VMs with one internal network"
+    # class: parent      # Optional. Used to organize VNFs
+    internal-connections:
+    -   name:        internalnet
+        description: internalnet
+        type:        e-lan
+        implementation: overlay
+        ip-profile:
+            ip-version:       IPv4
+            subnet-address:   192.168.1.0/24
+            gateway-address:  192.168.1.1
+            dns-address:      8.8.8.8
+            dhcp:
+                enabled: true
+                start-address: 192.168.1.100
+                count: 100
+        elements:
+        -   VNFC:             linux_2VMs-VM1
+            local_iface_name: xe0
+            ip_address:       192.168.1.2
+        -   VNFC:             linux_2VMs-VM2
+            local_iface_name: xe0
+            ip_address:       192.168.1.3
+    external-connections:
+    -   name:              control0
+        type:              mgmt
+        VNFC:              linux_2VMs-VM1
+        local_iface_name:  eth0
+        description:       control interface VM1
+    -   name:              control1
+        type:              mgmt
+        VNFC:              linux_2VMs-VM2
+        local_iface_name:  eth0
+        description:       control interface VM2
+    -   name:              in
+        type:              bridge
+        VNFC:              linux_2VMs-VM1
+        local_iface_name:  xe1
+        description:       data interface input
+    -   name:              out
+        type:              bridge
+        VNFC:              linux_2VMs-VM2
+        local_iface_name:  xe1
+        description:       data interface output
+    VNFC:
+    -   name:        linux_2VMs-VM1
+        description: "Linux VM1 with 4 CPUs, 2 GB RAM and 3 bridge interfaces"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/linux_VNF_2VMs.qcow2
+        disk: 10
+        vcpus: 4
+        ram: 2048
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+        -   name: xe0
+            vpci:      "0000:00:11.0"
+            bandwidth: 1 Mbps
+        -   name: xe1
+            vpci:      "0000:00:12.0"
+            bandwidth: 1 Mbps
+    -   name:        linux_2VMs-VM2
+        description: "Linux VM2 with 2 CPUs, 2 GB RAM and 3 bridge interfaces"
+        #Copy the image to a compute path and edit this path
+        VNFC image:  /path/to/imagefolder/linux_VNF_2VMs.qcow2
+        disk: 10
+        vcpus: 2
+        ram: 2048
+        bridge-ifaces:
+        -   name:      eth0
+            vpci:      "0000:00:09.0"
+            bandwidth: 1 Mbps          # Optional, informative only
+        -   name: xe0
+            vpci:      "0000:00:11.0"
+            bandwidth: 1 Mbps
+        -   name: xe1
+            vpci:      "0000:00:12.0"
+            bandwidth: 1 Mbps
+