X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=scenarios%2Fexamples%2Fcomplex.yaml;h=4fa3ffc0c805c01f23efff6d8c29b10ee629a905;hb=cdfaf0223ea059b20b721f4fbb02ab97f83d3601;hp=074c801ec73438616f73fada60d1d2b45f38bbe9;hpb=7edb675ac76f3e0473042cf5cf7de3c0f19eda7d;p=osm%2FRO.git

diff --git a/scenarios/examples/complex.yaml b/scenarios/examples/complex.yaml
old mode 100755
new mode 100644
index 074c801e..4fa3ffc0
--- a/scenarios/examples/complex.yaml
+++ b/scenarios/examples/complex.yaml
@@ -1,57 +1,67 @@
+##
+# 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
+##
 ---
-name:            complex
-description:     Complex network scenario consisting of 4 VNFs interconnected
-topology: 
-  nodes: 
+schema_version:  2
+scenario:
+  name:          complex
+  description:   Complex network scenario consisting of 4 VNFs interconnected
+  vnfs: 
     linux1:                   # vnf/net name in the scenario
-      type:      VNF          # VNF, network, external_network (if it is a datacenter network)
-      VNF model: linux        # VNF name as introduced in OPENMANO DB
+      vnf_name:  linux        # VNF name as introduced in OPENMANO DB
     node1:
-      type:      VNF
-      VNF model: dataplaneVNF1
+      vnf_name:  dataplaneVNF1
     node2:
-      type:      VNF
-      VNF model: dataplaneVNF2
+      vnf_name:  dataplaneVNF2
     node3:
-      type:      VNF
-      VNF model: dataplaneVNF2
-    bridge1: 
-      type:      network
-      model:     bridge_net
-    default: 
-      type:      external_network # Datacenter net
-      model:     default
-  connections: 
+      vnf_name:  dataplaneVNF2
+  networks: 
     dataconn1:
-      nodes: 
-      -   node1: xe0
-      -   node2: xe0
+      interfaces: 
+      - node1:   xe0
+      - node2:   xe0
     dataconn2:
-      nodes: 
-      -   node1: xe1
-      -   node2: xe1
+      interfaces: 
+      - node1:   xe1
+      - node2:   xe1
     dataconn3:
-      nodes: 
-      -   node1: xe2
-      -   node3: xe0
+      interfaces: 
+      - node1:   xe2
+      - node3:   xe0
     dataconn4:
-      nodes: 
-      -   node1: xe3
-      -   node3: xe1
+      interfaces: 
+      - node1:   xe3
+      - node3:   xe1
     data-sriov1:
-      nodes: 
-      -   node2: xe2
-      -   node3: xe2
-    bridgeconn1:
-      nodes: 
-      -   bridge1: null
-      -   linux1:  eth0
-      -   node2:   control
-      -   node3:   control
-    mngmt-net:
-      nodes: 
-      -   default: null
-      -   node1:   mgmt
-      -   node2:   mgmt
-      -   node3:   mgmt
+      interfaces: 
+      - node2:   xe2
+      - node3:   xe2
+    bridge1:
+      interfaces: 
+      - linux1:  eth0
+      - node2:   control
+      - node3:   control
+    default:
+      external:  true
+      interfaces: 
+      - node1:   mgmt
+      - node2:   mgmt
+      - node3:   mgmt