From 1b8c143f19b163b5899164cd43c73c6e02a29895 Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 8 Jul 2016 13:21:01 +0200 Subject: [PATCH] change scenario examples to schema version 2 Signed-off-by: tierno --- scenarios/examples/complex.yaml | 81 ++++++++++++++------------------ scenarios/examples/complex2.yaml | 32 ++++++------- scenarios/examples/simple.yaml | 24 ++++------ utils.py | 0 4 files changed, 59 insertions(+), 78 deletions(-) mode change 100755 => 100644 utils.py diff --git a/scenarios/examples/complex.yaml b/scenarios/examples/complex.yaml index 676dd9c7..07ee6cb1 100644 --- a/scenarios/examples/complex.yaml +++ b/scenarios/examples/complex.yaml @@ -19,59 +19,48 @@ # 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: + interfaces: + - node1: mgmt + - node2: mgmt + - node3: mgmt diff --git a/scenarios/examples/complex2.yaml b/scenarios/examples/complex2.yaml index b8969cf0..1a418d43 100644 --- a/scenarios/examples/complex2.yaml +++ b/scenarios/examples/complex2.yaml @@ -19,31 +19,27 @@ # contact with: nfvlabs@tid.es ## --- -name: complex2 -description: Complex network scenario consisting of 2 VNFs interconnected -topology: - nodes: - VNF2vms: # vnf/net name in the scenario - type: VNF # VNF, network, external_network (if it is a datacenter network) - VNF model: dataplaneVNF_2VMs # VNF name as introduced in OPENMANO DB +schema_version: 2 +scenario: + name: complex2 + description: Complex network scenario consisting of 2 VNFs interconnected + public: false + vnfs: + VNF2vms: # vnf name in the scenario + vnf_name: dataplaneVNF_2VMs # openmano vnf name VNF3: - type: VNF - VNF model: dataplaneVNF3 - default: - type: external_network # Datacenter net - model: default - connections: + vnf_name: dataplaneVNF3 + networks: dataconn1: - nodes: + interfaces: - VNF2vms: in - VNF3: data0 dataconn2: - nodes: + interfaces: - VNF2vms: out - VNF3: data1 - mngmt-net: - nodes: - - default: null + default: + interfaces: - VNF2vms: control0 - VNF2vms: control1 - VNF3: mgmt diff --git a/scenarios/examples/simple.yaml b/scenarios/examples/simple.yaml index 7cba170b..9384df91 100644 --- a/scenarios/examples/simple.yaml +++ b/scenarios/examples/simple.yaml @@ -19,19 +19,15 @@ # contact with: nfvlabs@tid.es ## --- -name: simple -description: Simple network scenario consisting of a single VNF connected to an external network -topology: - nodes: +schema_version: 2 +scenario: + name: simple + description: Simple network scenario consisting of a single VNF connected to an external network + 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 - default: - type: external_network # Datacenter net - model: default - connections: - conn1: # provide a name for this net or connection - nodes: - - default: null # Datacenter net - - linux1: eth0 # Node and its interface + vnf_name: linux # VNF name as introduced in OPENMANO DB + networks: + default: # provide a name for this net or connection + interfaces: + - linux1: eth0 # Node and its interface diff --git a/utils.py b/utils.py old mode 100755 new mode 100644 -- 2.17.1