Fix 1475 - Incorrect description in instantiating error

[osm/RO.git] / vnfs / examples / dataplaneVNF3.yaml

diff --git a/vnfs/examples/dataplaneVNF3.yaml b/vnfs/examples/dataplaneVNF3.yaml
index 73d2cf9..b5c80d5 100644 (file)
--- a/vnfs/examples/dataplaneVNF3.yaml
+++ b/vnfs/examples/dataplaneVNF3.yaml
@@ -1,65 +1,65 @@
-##\r
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.\r
-# This file is part of openmano\r
-# All Rights Reserved.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License"); you may\r
-# not use this file except in compliance with the License. You may obtain\r
-# a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r
-# License for the specific language governing permissions and limitations\r
-# under the License.\r
-#\r
-# For those usages not covered by the Apache License, Version 2.0 please\r
-# contact with: nfvlabs@tid.es\r
-##\r
----\r
-vnf:\r
-    name:        dataplaneVNF3\r
-    description: "Example of a dataplane VNF consisting of one VM with two SR-IOV"\r
-    # class: parent      # Optional. Used to organize VNFs\r
-    external-connections:\r
-    -   name:              mgmt\r
-        type:              mgmt\r
-        VNFC:              dataplaneVNF3-VM\r
-        local_iface_name:  eth0\r
-        description:       control interface VM1\r
-    -   name:              data0\r
-        type:              data\r
-        VNFC:              dataplaneVNF3-VM\r
-        local_iface_name:  xe0\r
-        description:       Dataplane interface\r
-    -   name:              data1\r
-        type:              data\r
-        VNFC:              dataplaneVNF3-VM\r
-        local_iface_name:  xe1\r
-        description:       Dataplane interface\r
-    VNFC:\r
-    -   name:        dataplaneVNF3-VM\r
-        description: "Dataplane VM with 2 threads, 2 GB hugepages, 2 SR-IOV interface"\r
-        #Copy the image to a compute path and edit this path\r
-        VNFC image:  /path/to/imagefolder/dataplaneVNF3.qcow2\r
-        disk: 10\r
-        numas: \r
-        -   threads: 2         # "cores", "paired-threads", "threads"\r
-            memory: 2                 # GBytes\r
-            interfaces:\r
-            -   name:      xe0\r
-                vpci:      "0000:00:11.0"\r
-                dedicated: "no"         # "yes"(passthrough), "no"(sriov with vlan tags), "yes:sriov"(sriovi, but exclusive and without vlan tag)\r
-                bandwidth: 1 Gbps\r
-            -   name:      xe1\r
-                vpci:      "0000:00:12.0"\r
-                dedicated: "no"\r
-                bandwidth: 1 Gbps\r
-        bridge-ifaces:\r
-        -   name:      eth0\r
-            vpci:      "0000:00:09.0"\r
-            bandwidth: 1 Mbps          # Optional, informative only\r
-\r
-\r
+##
+# Copyright 2015 Telefonica Investigacion 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
+
+