changed/added license heading. Moved some json files to yaml 99/299/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 8 Sep 2016 08:57:02 +0000 (10:57 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 8 Sep 2016 08:57:02 +0000 (10:57 +0200)
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
91 files changed:
ODL.py
RADclass.py
auxiliary_functions.py
charm/bundles/openmano.yaml
charm/openvim/interface-openvim-compute/interface.yaml
charm/openvim/interface-openvim-compute/provides.py
charm/openvim/interface-openvim-compute/requires.py
charm/openvim/interface-openvim/interface.yaml
charm/openvim/interface-openvim/provides.py
charm/openvim/interface-openvim/requires.py
charm/openvim/layer-openvim-compute/layer.yaml
charm/openvim/layer-openvim-compute/metadata.yaml
charm/openvim/layer-openvim-compute/reactive/openvim.py
charm/openvim/layer-openvim/layer.yaml
charm/openvim/layer-openvim/metadata.yaml
charm/openvim/layer-openvim/reactive/openvim.py
charm/openvim/layer-openvim/templates/flavor.yaml
charm/openvim/layer-openvim/templates/image.yaml
charm/openvim/layer-openvim/templates/net-default.yaml
charm/openvim/layer-openvim/templates/net-virbr0.yaml
charm/openvim/layer-openvim/templates/openvimd.cfg
charm/openvim/layer-openvim/templates/server.yaml
charm/openvim/layer-openvim/templates/tenant.yaml
charm/openvim/layer-openvim/tests/openvim.py
charm/openvim/layer-openvim/tests/tests.yaml
database_utils/dump_db.sh
database_utils/host_ranking.sql
database_utils/init_vim_db.sh
database_utils/migrate_vim_db.sh
database_utils/nets.sql
database_utils/of_ports_pci_correspondence.sql
database_utils/vim_db_structure.sql
definitionsClass.py
dhcp_thread.py
floodlight.py
host_thread.py
httpserver.py
openflow_thread.py
openvim
openvimd.cfg
openvimd.py
scripts/configure-compute-node-RHEL7.1.sh
scripts/configure-compute-node-RHEL7.2.sh
scripts/configure-compute-node-UBUNTU14.04.sh
scripts/configure-compute-node-develop.sh
scripts/get_dhcp_lease.sh
scripts/host-add-develop.sh
scripts/host-add.sh
scripts/initopenvim.sh
scripts/install-floodlight.sh
scripts/install-openvim.sh
scripts/openvim-report.sh
scripts/service-floodlight.sh
scripts/service-opendaylight.sh
scripts/service-openvim.sh
templates/flavor.yaml
templates/image.yaml
templates/network.yaml
templates/port.yaml
templates/server.yaml
templates/tenant.yaml
test/2VM_2I.sh
test/2VM_2I_2VLAN.sh
test/2VM_NoHuge.sh
test/flavors/2Th_2G.yaml
test/flavors/5PTh_8G_2I.yaml
test/flavors/new_flavor.yaml
test/get_params.sh
test/hosts/host-example0.json [deleted file]
test/hosts/host-example0.yaml [new file with mode: 0644]
test/hosts/host-example1.json [deleted file]
test/hosts/host-example1.yaml [new file with mode: 0644]
test/hosts/host-example2.json [deleted file]
test/hosts/host-example2.yaml [new file with mode: 0644]
test/hosts/host-example3.json [deleted file]
test/hosts/host-example3.yaml [new file with mode: 0644]
test/hosts/new_host.yaml
test/images/new_image.yaml
test/networks/net-example0.yaml
test/networks/net-example1.yaml
test/networks/net-example2.yaml
test/networks/net-example3.yaml
test/networks/new_network.yaml
test/ports/new_port.yaml
test/servers/new_server.yaml
test/tenants/new_tenant.yaml
test/test_openflow.sh
test/test_openvim.py
test/test_vim.sh
vim_db.py
vim_schema.py

diff --git a/ODL.py b/ODL.py
index e244c67..1c8fe44 100644 (file)
--- a/ODL.py
+++ b/ODL.py
@@ -3,7 +3,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index bfbdbaf..a4c10ec 100644 (file)
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-import code
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 44e7fcb..795d84a 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index d0e09a6..f575692 100644 (file)
@@ -1,3 +1,20 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
 series: xenial
 services:
   mariadb:
index 72f7f8a..b8fe8e7 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 name: openvim-compute
 version: 0
 description: Connection to an OpenVIM compute host
index adb0829..612a2fe 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 from charms.reactive import hook
 from charms.reactive import RelationBase
 from charms.reactive import scopes
@@ -25,4 +43,4 @@ class ProvidesOpenVIMCompute(RelationBase):
 
     def send_user(self, user):
         convo = self.conversation()
-        convo.set_remote('user', user)
\ No newline at end of file
+        convo.set_remote('user', user)
index 86dd6e1..a8cf779 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 from charms.reactive import hook
 from charms.reactive import RelationBase
 from charms.reactive import scopes
index fce5577..1d1f45b 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 name: openvim
 summary: Basic OpenVIM interface
 version: 1
index c4ade3f..2428b31 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 from charmhelpers.core import hookenv
 from charms.reactive import hook
 from charms.reactive import RelationBase
index 77da9ca..19ca4af 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 from charms.reactive import hook
 from charms.reactive import RelationBase
 from charms.reactive import scopes
index 4746769..deda05f 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 includes:
   - 'layer:basic'
   - 'interface:openvim-compute'
index e9344cf..6eb07e4 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 name: openvim-compute
 summary: Open Virtual Infrastructure Manager
 maintainers:
index cf6937f..d5994cb 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 from os import chmod
 from charms.reactive import when, when_not, set_state
 from charmhelpers.core.hookenv import status_set
index d9078d9..df79153 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 includes:
   - 'layer:basic'
   - 'interface:mysql'
index 4444735..6f1dcb5 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 name: openvim
 summary: Open Virtual Infrastructure Manager
 maintainers:
index d31a9f2..22a8bbc 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 import os
 import json
 import time
index 3e99ead..c750519 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 flavor:
     name:        xenial
     description: xenial
index 73b87b3..378f6fa 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 image:
     name:         xenial
     description:  xenial
index 6e93f85..9016589 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 network:
     name:               default
     type:               bridge_man
index dae78ba..78abaa0 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 network:
     name:               shared_bridge_net
     type:               bridge_data
index c4175c5..2a51c4d 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index b21e72d..f2ebb98 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 server:
   name: VM
   description: VM
index 7c3d59f..04b3324 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 tenant:
     name:          openvim-tenant
     description:   openvim-tenant
index ce5a32c..ca9f7d0 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 import requests
 import json
 
index 7b10e42..f943322 100644 (file)
@@ -1,3 +1,21 @@
+##
+# Copyright 2016
+# This file is part of openvim
+#
+# 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.
+#
+##
+
 packages:
   - amulet
   - python3-requests
index 67d6823..1a7a4b6 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -23,7 +23,7 @@
 
 LICENSE_HEAD='/**
 * Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-* This file is part of openmano
+* This file is part of openvim
 * All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may
index 5e229bf..d522613 100644 (file)
@@ -1,7 +1,7 @@
 /*
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index a2dcdea..f025a9d 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index a8fec3e..816cee7 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 654d0d1..3dcd875 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index b9aa846..9a1ce78 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 1499171..fd4aeed 100644 (file)
@@ -1,6 +1,6 @@
 /**
 * Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-* This file is part of openmano
+* This file is part of openvim
 * All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may
index af680d9..70168e8 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index a24585e..5cf1e80 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index eb6b6fb..fe7d616 100644 (file)
@@ -3,7 +3,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 1049e40..cae8c60 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 9112182..86f96a6 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index a002b89..265b167 100644 (file)
@@ -3,7 +3,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/openvim b/openvim
index ae49e29..cb7321d 100755 (executable)
--- a/openvim
+++ b/openvim
@@ -4,7 +4,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 022a5e3..ccc888f 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 3a13623..cc2ae59 100755 (executable)
@@ -3,7 +3,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 0fb4056..57f56c9 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index b68aebb..b8e06a4 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 9d7daa7..0cff780 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index c378459..19c39d4 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index d2f04c3..247a675 100755 (executable)
@@ -1,4 +1,24 @@
 #!/bin/bash
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
 awk '
 ($1=="lease" && $3=="{"){ lease=$2; active="no"; found="no" }
 ($1=="binding" && $2=="state" && $3=="active;"){ active="yes" }
index dce4bde..ed84cdf 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index cf2138d..c52f3fa 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 69f3667..fabcb24 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -173,10 +173,10 @@ then
 elif [[ $action == "create" ]]
 then
     echo "Adding example hosts"
-    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example0.json || ! echo "fail" >&2 || $_exit 1
-    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example1.json || ! echo "fail" >&2 || $_exit 1
-    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example2.json || ! echo "fail" >&2 || $_exit 1
-    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example3.json || ! echo "fail" >&2 || $_exit 1
+    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example0.yaml || ! echo "fail" >&2 || $_exit 1
+    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example1.yaml || ! echo "fail" >&2 || $_exit 1
+    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example2.yaml || ! echo "fail" >&2 || $_exit 1
+    ${DIRvim}/openvim host-add $DIRvim/test/hosts/host-example3.yaml || ! echo "fail" >&2 || $_exit 1
     echo "Adding example nets"
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example0.yaml || ! echo "fail" >&2 || $_exit 1
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example1.yaml || ! echo "fail" >&2 || $_exit 1
index 506d5c1..74c1c00 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index fbf0fb5..0899b93 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # contact with: nfvlabs@tid.es
 ##
 
-#ONLY TESTED for Ubuntu 14.10 14.04, CentOS7 and RHEL7
+#ONLY TESTED for Ubuntu 14.10 14.04 16.04, CentOS7 and RHEL7
 #Get needed packages, source code and configure to run openvim
 #Ask for database user and password if not provided
-#        $1: database user
-#        $2: database password 
 
 function usage(){
-    echo  -e "usage: sudo $0 [db-user [db-passwd]]\n  Install source code in ./openvim"
+    echo -e "usage: sudo $0 [OPTIONS]"
+    echo -e "Install last stable source code in ./openvim and the needed packages"
+    echo -e "On a Ubuntu 16.04 it configures openvim as a service"
+    echo -e "  OPTIONS"
+    echo -e "     -u USER:    database admin user. 'root' by default. Prompts if needed"
+    echo -e "     -p PASS:    database admin password to be used or installed. Prompts if needed"
+    echo -e "     -q --quiet: install in an unattended mode"
+    echo -e "     -h --help:  show this help"
+    echo -e "     --develop:  install last version for developers, and do not configure as a service"
+    echo -e "     --skip-install-packages: use this option to skip and update and install the requires packages. This avoid wasting time if you are sure requires packages are present for e.g. a previous installation"
 }
 
 function install_packages(){
@@ -49,11 +56,61 @@ function install_packages(){
     done
 }
 
-#check root privileges and non a root user behind
-[ "$1" == "-h" -o "$1" == "--help" ] && usage && exit 0
-[ "$USER" != "root" ] && echo "Needed root privileges" >&2 && usage >&2 && exit -1
-[ -z "$SUDO_USER" -o "$SUDO_USER" = "root" ] && echo "Must be runned with sudo from a non root user"  >&2 && usage >&2 && exit -1
 
+GIT_URL=https://osm.etsi.org/gerrit/osm/openvim.git
+DBUSER="root"
+DBPASSWD=""
+DBPASSWD_PARAM=""
+QUIET_MODE=""
+DEVELOP=""
+NO_PACKAGES=""
+while getopts ":u:p:hiq-:" o; do
+    case "${o}" in
+        u)
+            export DBUSER="$OPTARG"
+            ;;
+        p)
+            export DBPASSWD="$OPTARG"
+            export DBPASSWD_PARAM="-p$OPTARG"
+            ;;
+        q)
+            export QUIET_MODE=yes
+            export DEBIAN_FRONTEND=noninteractive
+            ;;
+        h)
+            usage && exit 0
+            ;;
+        -)
+            [ "${OPTARG}" == "help" ] && usage && exit 0
+            [ "${OPTARG}" == "develop" ] && DEVELOP="y" && continue
+            [ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue
+            [ "${OPTARG}" == "skip-install-packages" ] && export NO_PACKAGES=yes && continue
+            echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2
+            exit 1
+            ;;
+        \?)
+            echo -e "Invalid option: '-$OPTARG'\nTry $0 --help for more information" >&2
+            exit 1
+            ;;
+        :)
+            echo -e "Option '-$OPTARG' requires an argument\nTry $0 --help for more information" >&2
+            exit 1
+            ;;
+        *)
+            usage >&2
+            exit -1
+            ;;
+    esac
+done
+
+#check root privileges and non a root user behind
+[ "$USER" != "root" ] && echo "Needed root privileges" >&2 && exit -1
+if [[ -z "$SUDO_USER" ]] || [[ "$SUDO_USER" = "root" ]]
+then
+    [[ -z $QUIET_MODE ]] && read -e -p "Install in the root user (y/N)?" KK
+    [[ -z $QUIET_MODE ]] && [[ "$KK" != "y" ]] && [[ "$KK" != "yes" ]] && echo "Cancelled" && exit 1
+    export SUDO_USER=root
+fi
 
 #Discover Linux distribution
 #try redhat type
@@ -62,11 +119,12 @@ function install_packages(){
 [ -f /etc/redhat-release ] || _DISTRO=$(lsb_release -is  2>/dev/null)            
 if [ "$_DISTRO" == "Ubuntu" ]
 then
-    _RELEASE="14"
-    if ! lsb_release -rs | grep -q "14."
-    then 
-        read -e -p "WARNING! Not tested Ubuntu version. Continue assuming a '$_RELEASE' type? (y/N)" KK
-        [ "$KK" != "y" -a  "$KK" != "yes" ] && echo "Cancelled" && exit 0
+    _RELEASE=$(lsb_release -rs)
+    if [[ ${_RELEASE%%.*} != 14 ]] && [[ ${_RELEASE%%.*} != 16 ]]
+    then
+        [[ -z $QUIET_MODE ]] && read -e -p "WARNING! Not tested Ubuntu version. Continue assuming a trusty (14.XX)'? (y/N)" KK
+        [[ -z $QUIET_MODE ]] && [[ "$KK" != "y" ]] && [[ "$KK" != "yes" ]] && echo "Cancelled" && exit 1
+        _RELEASE = 14
     fi
 elif [ "$_DISTRO" == "CentOS" ]
 then
@@ -93,7 +151,8 @@ else  #[ "$_DISTRO" != "Ubuntu" -a "$_DISTRO" != "CentOS" -a "$_DISTRO" != "Red"
 fi
 
 
-
+if [[ -z "$NO_PACKAGES" ]]
+then
 echo '
 #################################################################
 #####               UPDATE REPOSITORIES                     #####
@@ -105,14 +164,24 @@ echo '
 [ "$_DISTRO" == "Red" ] && wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm \
   && sudo rpm -ivh epel-release-7-5.noarch.rpm && sudo yum install -y epel-release && rm -f epel-release-7-5.noarch.rpm
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && sudo yum repolist
+fi
 
-
+if [[ -z "$NO_PACKAGES" ]]
+then
 echo '
 #################################################################
 #####               INSTALL REQUIRED PACKAGES               #####
 #################################################################'
-[ "$_DISTRO" == "Ubuntu" ] && install_packages "mysql-server"
-[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "mariadb mariadb-server"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "git screen wget mysql-server"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git screen wget mariadb mariadb-server"
+
+if [[ "$_DISTRO" == "Ubuntu" ]]
+then
+    #start services. By default CentOS does not start services
+    service mysql start >> /dev/null
+    # try to set admin password, ignore if fails
+    [[ -n $DBPASSWD ]] && mysqladmin -u $DBUSER -s password $DBPASSWD
+fi
 
 if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
 then
@@ -130,40 +199,46 @@ then
         firewall-cmd --permanent --zone=public --add-service=https &&
         firewall-cmd --reload
 fi
+fi  #[[ -z "$NO_PACKAGES" ]]
 
-#check and ask for database user password. Must be done after database instalation
-[ -n "$1" ] && DBUSER=$1
-[ -z "$1" ] && DBUSER=root
-[ -n "$2" ] && DBPASSWD="-p$2"
-[ -z "$2" ] && DBPASSWD=""
-echo -e "\nCheking database connection and ask for credentials"
-while !  echo "" | mysql -u$DBUSER $DBPASSWD
-do
+#check and ask for database user password. Must be done after database installation
+if [[ -n $QUIET_MODE ]]
+then
+    echo -e "\nCheking database connection and ask for credentials"
+    while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM ping
+    do
         [ -n "$logintry" ] &&  echo -e "\nInvalid database credentials!!!. Try again (Ctrl+c to abort)"
         [ -z "$logintry" ] &&  echo -e "\nProvide database credentials"
         read -e -p "database user? ($DBUSER) " DBUSER_
         [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
         read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
-        [ -n "$DBPASSWD_" ] && DBPASSWD="-p$DBPASSWD_"
-        [ -z "$DBPASSWD_" ] && DBPASSWD=""
+        [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
+        [ -z "$DBPASSWD_" ] && DBPASSWD=""           && DBPASSWD_PARAM=""
         logintry="yes"
-done
+    done
+fi
 
+if [[ -z "$NO_PACKAGES" ]]
+then
 echo '
 #################################################################
 #####               INSTALL PYTHON PACKAGES                 #####
 #################################################################'
-[ "$_DISTRO" == "Ubuntu" ] && install_packages "python-yaml python-libvirt python-bottle python-mysqldb python-jsonschema python-paramiko python-argcomplete python-requests git screen wget"
-[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "PyYAML libvirt-python MySQL-python python-jsonschema python-paramiko python-argcomplete python-requests git screen wget"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "python-yaml python-libvirt python-bottle python-mysqldb python-jsonschema python-paramiko python-argcomplete python-requests"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "PyYAML libvirt-python MySQL-python python-jsonschema python-paramiko python-argcomplete python-requests"
 
 #The only way to install python-bottle on Centos7 is with easy_install or pip
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && easy_install -U bottle
 
+fi  #[[ -z "$NO_PACKAGES" ]]
+
 echo '
 #################################################################
 #####                 DOWNLOAD SOURCE                       #####
 #################################################################'
-su $SUDO_USER -c 'git clone https://github.com/nfvlabs/openvim.git openvim'
+su $SUDO_USER -c 'git clone '"${GIT_URL}"' openvim'
+#[[ -z $DEVELOP ]] && su $SUDO_USER -c 'git checkout <tag version>'
+
 #Unncoment to use a concrete branch, if not main branch 
 #pushd openvim
 #su $SUDO_USER -c 'git checkout v0.4'
@@ -173,13 +248,14 @@ echo '
 #################################################################
 #####               CREATE DATABASE                         #####
 #################################################################'
-mysqladmin -u$DBUSER $DBPASSWD create vim_db
+mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create vim_db || ! echo "Cannot create database vim_db" || exit 1
+
+echo "CREATE USER 'vim'@'localhost' identified by 'vimpw';"     | mysql -u$DBUSER $DBPASSWD_PARAM || ! echo "Failed while creating user vim at dabase" || exit 1
+echo "GRANT ALL PRIVILEGES ON vim_db.* TO 'vim'@'localhost';"   | mysql -u$DBUSER $DBPASSWD_PARAM || ! echo "Failed while creating user vim at dabase" || exit 1
+echo " Database 'vim_db' created, user 'vim' password 'vimpw'"
 
-echo "CREATE USER 'vim'@'localhost' identified by 'vimpw';"     | mysql -u$DBUSER $DBPASSWD
-echo "GRANT ALL PRIVILEGES ON vim_db.* TO 'vim'@'localhost';"   | mysql -u$DBUSER $DBPASSWD
 
-echo "vim database"
-su $SUDO_USER -c './openvim/database_utils/init_vim_db.sh -u vim -p vimpw'
+su $SUDO_USER -c './openvim/database_utils/init_vim_db.sh -u vim -p vimpw'  || ! echo "Failed while creating user vim at dabase" || exit 1
 
 
 if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
@@ -214,24 +290,24 @@ fi
 
 echo '
 #################################################################
-#####        CONFIGURE openvim CLIENTS                      #####
+#####        CONFIGURE openvim CLIENT                       #####
 #################################################################'
 #creates a link at ~/bin
 su $SUDO_USER -c 'mkdir -p ~/bin'
-rm -f /home/${SUDO_USER}/bin/openvim
-rm -f /home/${SUDO_USER}/bin/openflow
-rm -f /home/${SUDO_USER}/bin/service-openvim
-rm -f /home/${SUDO_USER}/bin/initopenvim
-rm -f /home/${SUDO_USER}/bin/service-floodlight
-rm -f /home/${SUDO_USER}/bin/service-opendaylight
-rm -f /home/${SUDO_USER}/bin/get_dhcp_lease.sh
-ln -s ${PWD}/openvim/openvim   /home/${SUDO_USER}/bin/openvim
-ln -s ${PWD}/openvim/openflow  /home/${SUDO_USER}/bin/openflow
-ln -s ${PWD}/openvim/scripts/service-openvim.sh  /home/${SUDO_USER}/bin/service-openvim
-ln -s ${PWD}/openvim/scripts/initopenvim.sh  /home/${SUDO_USER}/bin/initopenvim
-ln -s ${PWD}/openvim/scripts/service-floodlight.sh  /home/${SUDO_USER}/bin/service-floodlight
-ln -s ${PWD}/openvim/scripts/service-opendaylight.sh  /home/${SUDO_USER}/bin/service-opendaylight
-ln -s ${PWD}/openvim/scripts/get_dhcp_lease.sh  /home/${SUDO_USER}/bin/get_dhcp_lease.sh
+su $SUDO_USER -c 'rm -f ${HOME}/bin/openvim'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/openflow'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/service-openvim'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/initopenvim'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/service-floodlight'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/service-opendaylight'
+su $SUDO_USER -c 'rm -f ${HOME}/bin/get_dhcp_lease.sh'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/openvim   ${HOME}/bin/openvim'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/openflow  ${HOME}/bin/openflow'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/scripts/service-openvim.sh  ${HOME}/bin/service-openvim'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/scripts/initopenvim.sh  ${HOME}/bin/initopenvim'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/scripts/service-floodlight.sh  ${HOME}/bin/service-floodlight'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/scripts/service-opendaylight.sh  ${HOME}/bin/service-opendaylight'
+su $SUDO_USER -c 'ln -s ${PWD}/openvim/scripts/get_dhcp_lease.sh  ${HOME}/bin/get_dhcp_lease.sh'
 
 #insert /home/<user>/bin in the PATH
 #skiped because normally this is done authomatically when ~/bin exist
@@ -241,6 +317,15 @@ ln -s ${PWD}/openvim/scripts/get_dhcp_lease.sh  /home/${SUDO_USER}/bin/get_dhcp_
 #    su $SUDO_USER -c 'echo "PATH=\$PATH:/home/\${USER}/bin" >> ~/.bashrc'
 #fi
 
+if [[ $SUDO_USER == root ]]
+then
+    if ! echo $PATH | grep -q "${HOME}/bin"
+    then
+        echo "PATH=\$PATH:\${HOME}/bin" >> ${HOME}/.bashrc
+    fi
+fi
+
+
 #configure arg-autocomplete for this user
 #in case of minmal instalation this package is not installed by default
 [[ "$_DISTRO" == "CentOS" || "$_DISTRO" == "Red" ]] && yum install -y bash-completion
@@ -252,9 +337,28 @@ then
     su $SUDO_USER -c 'echo ". /home/${USER}/.bash_completion.d/python-argcomplete.sh" >> ~/.bashrc'
 fi
 
-echo
-echo "Done!  you may need to logout and login again for loading the configuration"
-echo " Run './openvim/scripts/service-openvim.sh start' for starting openvim in a screen"
 
 
+if [[ "$_DISTRO" == "Ubuntu" ]] &&  [[ ${_RELEASE%%.*} == 16 ]] && [[ -z $DEVELOP ]]
+then
+echo '
+#################################################################
+#####             CONFIGURE OPENMANO SERVICE                #####
+#################################################################'
+
+    ./openvim/scripts/install-service-openvim.sh -f openvim #-u $SUDO_USER
+#    alias service-openvim="service openvim"
+#    echo 'alias service-openvim="service openvim"' >> ${HOME}/.bashrc
 
+    echo
+    echo "Done!  you may need to logout and login again for loading client configuration"
+    echo " Manage server with 'service openvim start|stop|status|...' "
+
+
+else
+
+    echo
+    echo "Done!  you may need to logout and login again for loading client configuration"
+    echo " Run './openvim/scripts/service-openvim.sh start' for starting openvim in a screen"
+
+fi
index 951634d..b53243b 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index b7130a6..b8aa38e 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 3c060c6..144bba9 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index aaa9a27..898bba6 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 3a240b6..8c64ba0 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 05045b4..2ac06bc 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 02fa42b..d49dd18 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 14297ed..f6f84c4 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 72f4564..d31f175 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 94c6b24..653b165 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 96f8100..eb21156 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 1e0f626..ed95730 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 9326ec2..a83612f 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 3df9573..191213a 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 9ffeb49..d1f7fff 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index fab23d5..aa5c843 100644 (file)
@@ -1,7 +1,6 @@
-
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 0a0f6df..98811de 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/test/hosts/host-example0.json b/test/hosts/host-example0.json
deleted file mode 100644 (file)
index b5dc5ee..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-{
-    "host":{
-        "name": "fake-host-0",
-        "user": "user", 
-        "password": "password", 
-        "ip_name": "fakehost0" 
-    },
-"host-data":
-{
-    "name": "fake-host-0",
-    "ranking": 300,
-    "description": "fake host 0 for test mode",
-    "ip_name": "fakehost0",
-    "features": "lps,dioc,hwsv,ht,64b,tlbps",
-    "user": "user",
-    "password": "password",
-    "numas": [
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 12,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 36,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 13
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 37
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 14
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 38
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 15
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 39
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 16
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 40
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 17
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 41
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 18
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 42
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 19
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 43
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 20
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 44
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 21
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 45
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 22
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 46
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 23
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 47
-                }
-            ],
-            "numa_socket": 1,
-            "hugepages": 28,
-            "memory": 32
-        },
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 0,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 24,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 1
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 25
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 2
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 26
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 3
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 27
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 4
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 28
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 5
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 29
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 6
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 30
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 7
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 31
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 8
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 32
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 9
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 33
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 10
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 34
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 11
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 35
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "eth8",
-                    "Mbps": 10000,
-                    "pci": "0000:08:00.0",
-                    "switch_port": "port0/2",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "a6:12:27:bd:2d:ef",
-                            "pci": "0000:08:10.0",
-                            "source_name": 0,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "be:8a:40:58:cf:de",
-                            "pci": "0000:08:10.2",
-                            "source_name": 1,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "c6:bf:7a:30:13:55",
-                            "pci": "0000:08:10.4",
-                            "source_name": 2,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "be:32:50:ef:ea:4e",
-                            "pci": "0000:08:10.6",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "ae:36:60:bc:41:78",
-                            "pci": "0000:08:11.0",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "52:22:3a:99:67:4e",
-                            "pci": "0000:08:11.2",
-                            "source_name": 5,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "0a:b8:00:2c:8a:b2",
-                            "pci": "0000:08:11.4",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "e2:f6:70:83:a3:ec",
-                            "pci": "0000:08:11.6",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "90:e2:ba:0c:36:4c"
-                },
-                {
-                    "source_name": "eth17",
-                    "Mbps": 10000,
-                    "pci": "0000:08:00.1",
-                    "switch_port": "port0/3",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "92:0e:27:0c:ad:eb",
-                            "pci": "0000:08:10.1",
-                            "source_name": 0,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "be:99:65:e8:98:a3",
-                            "pci": "0000:08:10.3",
-                            "source_name": 1,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "8a:3b:54:42:88:b2",
-                            "pci": "0000:08:10.5",
-                            "source_name": 2,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "c6:5d:8a:c5:05:f7",
-                            "pci": "0000:08:10.7",
-                            "source_name": 3,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "96:bd:61:02:4f:d6",
-                            "pci": "0000:08:11.1",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "22:5d:85:2c:1b:fd",
-                            "pci": "0000:08:11.3",
-                            "source_name": 5,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "e6:7f:8a:48:bc:26",
-                            "pci": "0000:08:11.5",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "2e:4a:e6:68:18:fa",
-                            "pci": "0000:08:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "90:e2:ba:0c:36:4d"
-                },
-                {
-                    "source_name": "eth26",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.0",
-                    "switch_port": "port0/0",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "02:79:15:02:ad:cc",
-                            "pci": "0000:06:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "06:81:ef:de:ec:6b",
-                            "pci": "0000:06:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "f2:4e:96:f3:8e:73",
-                            "pci": "0000:06:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "e2:86:91:23:c5:76",
-                            "pci": "0000:06:10.6",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "52:12:a0:77:cc:47",
-                            "pci": "0000:06:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "ca:17:4a:c4:cb:bf",
-                            "pci": "0000:06:11.2",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "de:13:4c:5d:70:e8",
-                            "pci": "0000:06:11.4",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "0a:5f:d2:db:7f:e2",
-                            "pci": "0000:06:11.6",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "90:e2:ba:0b:6b:b4"
-                },
-                {
-                    "source_name": "eth35",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.1",
-                    "switch_port": "port0/1",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "a2:08:55:fe:c5:db",
-                            "pci": "0000:06:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "7a:dd:c7:46:2a:91",
-                            "pci": "0000:06:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "92:a8:1d:4e:cc:a8",
-                            "pci": "0000:06:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "02:1a:d6:87:c4:cc",
-                            "pci": "0000:06:10.7",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "ea:1b:8b:2a:da:9a",
-                            "pci": "0000:06:11.1",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "aa:c3:fe:e5:f2:96",
-                            "pci": "0000:06:11.3",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "e2:66:1f:00:b3:45",
-                            "pci": "0000:06:11.5",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "da:3c:d8:a3:f4:e0",
-                            "pci": "0000:06:11.7",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "90:e2:ba:0b:6b:b5"
-                }
-            ],
-            "numa_socket": 0,
-            "hugepages": 28,
-            "memory": 32
-        }
-    ]
-}
-}
-
diff --git a/test/hosts/host-example0.yaml b/test/hosts/host-example0.yaml
new file mode 100644 (file)
index 0000000..b24c364
--- /dev/null
@@ -0,0 +1,302 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
+---
+host:
+  name: fake-host-0
+  user: user
+  password: password
+  ip_name: fakehost0
+host-data:
+  name: fake-host-0
+  ranking: 300
+  description: fake host 0 for test mode
+  ip_name: fakehost0
+  features: lps,dioc,hwsv,ht,64b,tlbps
+  user: user
+  password: password
+  numas:
+  - cores:
+    - core_id: 0
+      thread_id: 12
+      status: noteligible
+    - core_id: 0
+      thread_id: 36
+      status: noteligible
+    - core_id: 1
+      thread_id: 13
+    - core_id: 1
+      thread_id: 37
+    - core_id: 2
+      thread_id: 14
+    - core_id: 2
+      thread_id: 38
+    - core_id: 3
+      thread_id: 15
+    - core_id: 3
+      thread_id: 39
+    - core_id: 4
+      thread_id: 16
+    - core_id: 4
+      thread_id: 40
+    - core_id: 5
+      thread_id: 17
+    - core_id: 5
+      thread_id: 41
+    - core_id: 6
+      thread_id: 18
+    - core_id: 6
+      thread_id: 42
+    - core_id: 7
+      thread_id: 19
+    - core_id: 7
+      thread_id: 43
+    - core_id: 8
+      thread_id: 20
+    - core_id: 8
+      thread_id: 44
+    - core_id: 9
+      thread_id: 21
+    - core_id: 9
+      thread_id: 45
+    - core_id: 10
+      thread_id: 22
+    - core_id: 10
+      thread_id: 46
+    - core_id: 11
+      thread_id: 23
+    - core_id: 11
+      thread_id: 47
+    numa_socket: 1
+    hugepages: 28
+    memory: 32
+  - cores:
+    - core_id: 0
+      thread_id: 0
+      status: noteligible
+    - core_id: 0
+      thread_id: 24
+      status: noteligible
+    - core_id: 1
+      thread_id: 1
+    - core_id: 1
+      thread_id: 25
+    - core_id: 2
+      thread_id: 2
+    - core_id: 2
+      thread_id: 26
+    - core_id: 3
+      thread_id: 3
+    - core_id: 3
+      thread_id: 27
+    - core_id: 4
+      thread_id: 4
+    - core_id: 4
+      thread_id: 28
+    - core_id: 5
+      thread_id: 5
+    - core_id: 5
+      thread_id: 29
+    - core_id: 6
+      thread_id: 6
+    - core_id: 6
+      thread_id: 30
+    - core_id: 7
+      thread_id: 7
+    - core_id: 7
+      thread_id: 31
+    - core_id: 8
+      thread_id: 8
+    - core_id: 8
+      thread_id: 32
+    - core_id: 9
+      thread_id: 9
+    - core_id: 9
+      thread_id: 33
+    - core_id: 10
+      thread_id: 10
+    - core_id: 10
+      thread_id: 34
+    - core_id: 11
+      thread_id: 11
+    - core_id: 11
+      thread_id: 35
+    interfaces:
+    - source_name: eth8
+      Mbps: 10000
+      pci: '0000:08:00.0'
+      switch_port: port0/2
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: a6:12:27:bd:2d:ef
+        pci: '0000:08:10.0'
+        source_name: 0
+        vlan: 106
+      - mac: be:8a:40:58:cf:de
+        pci: '0000:08:10.2'
+        source_name: 1
+        vlan: 107
+      - mac: c6:bf:7a:30:13:55
+        pci: '0000:08:10.4'
+        source_name: 2
+        vlan: 103
+      - mac: be:32:50:ef:ea:4e
+        pci: '0000:08:10.6'
+        source_name: 3
+        vlan: 105
+      - mac: ae:36:60:bc:41:78
+        pci: '0000:08:11.0'
+        source_name: 4
+        vlan: 102
+      - mac: 52:22:3a:99:67:4e
+        pci: '0000:08:11.2'
+        source_name: 5
+        vlan: 104
+      - mac: 0a:b8:00:2c:8a:b2
+        pci: '0000:08:11.4'
+        source_name: 6
+        vlan: 100
+      - mac: e2:f6:70:83:a3:ec
+        pci: '0000:08:11.6'
+        source_name: 7
+        vlan: 101
+      mac: 90:e2:ba:0c:36:4c
+    - source_name: eth17
+      Mbps: 10000
+      pci: '0000:08:00.1'
+      switch_port: port0/3
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 92:0e:27:0c:ad:eb
+        pci: '0000:08:10.1'
+        source_name: 0
+        vlan: 105
+      - mac: be:99:65:e8:98:a3
+        pci: '0000:08:10.3'
+        source_name: 1
+        vlan: 106
+      - mac: 8a:3b:54:42:88:b2
+        pci: '0000:08:10.5'
+        source_name: 2
+        vlan: 101
+      - mac: c6:5d:8a:c5:05:f7
+        pci: '0000:08:10.7'
+        source_name: 3
+        vlan: 103
+      - mac: 96:bd:61:02:4f:d6
+        pci: '0000:08:11.1'
+        source_name: 4
+        vlan: 102
+      - mac: 22:5d:85:2c:1b:fd
+        pci: '0000:08:11.3'
+        source_name: 5
+        vlan: 104
+      - mac: e6:7f:8a:48:bc:26
+        pci: '0000:08:11.5'
+        source_name: 6
+        vlan: 100
+      - mac: 2e:4a:e6:68:18:fa
+        pci: '0000:08:11.7'
+        source_name: 7
+        vlan: 107
+      mac: 90:e2:ba:0c:36:4d
+    - source_name: eth26
+      Mbps: 10000
+      pci: '0000:06:00.0'
+      switch_port: port0/0
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 02:79:15:02:ad:cc
+        pci: '0000:06:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 06:81:ef:de:ec:6b
+        pci: '0000:06:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: f2:4e:96:f3:8e:73
+        pci: '0000:06:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: e2:86:91:23:c5:76
+        pci: '0000:06:10.6'
+        source_name: 3
+        vlan: 105
+      - mac: 52:12:a0:77:cc:47
+        pci: '0000:06:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: ca:17:4a:c4:cb:bf
+        pci: '0000:06:11.2'
+        source_name: 5
+        vlan: 102
+      - mac: de:13:4c:5d:70:e8
+        pci: '0000:06:11.4'
+        source_name: 6
+        vlan: 101
+      - mac: 0a:5f:d2:db:7f:e2
+        pci: '0000:06:11.6'
+        source_name: 7
+        vlan: 100
+      mac: 90:e2:ba:0b:6b:b4
+    - source_name: eth35
+      Mbps: 10000
+      pci: '0000:06:00.1'
+      switch_port: port0/1
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: a2:08:55:fe:c5:db
+        pci: '0000:06:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: 7a:dd:c7:46:2a:91
+        pci: '0000:06:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: 92:a8:1d:4e:cc:a8
+        pci: '0000:06:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: 02:1a:d6:87:c4:cc
+        pci: '0000:06:10.7'
+        source_name: 3
+        vlan: 105
+      - mac: ea:1b:8b:2a:da:9a
+        pci: '0000:06:11.1'
+        source_name: 4
+        vlan: 107
+      - mac: aa:c3:fe:e5:f2:96
+        pci: '0000:06:11.3'
+        source_name: 5
+        vlan: 102
+      - mac: e2:66:1f:00:b3:45
+        pci: '0000:06:11.5'
+        source_name: 6
+        vlan: 101
+      - mac: da:3c:d8:a3:f4:e0
+        pci: '0000:06:11.7'
+        source_name: 7
+        vlan: 100
+      mac: 90:e2:ba:0b:6b:b5
+    numa_socket: 0
+    hugepages: 28
+    memory: 32
+
diff --git a/test/hosts/host-example1.json b/test/hosts/host-example1.json
deleted file mode 100644 (file)
index 766aaef..0000000
+++ /dev/null
@@ -1,698 +0,0 @@
-{
-"host":{
-    "name": "fake-host-1",
-    "user": "user",
-    "password": "password",
-    "ip_name": "fakehost1"
-},
-"host-data":
-{
-    "name": "fake-host-1",
-    "ranking": 300,
-    "description": "fake host 1 for test mode",
-    "ip_name": "fakehost1",
-    "features": "lps,dioc,hwsv,ht,64b,tlbps",
-    "user": "user",
-    "password": "password",
-    "numas": [
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 1,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 25,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 3
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 27
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 5
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 29
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 7
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 31
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 9
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 33
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 11
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 35
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 13
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 37
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 15
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 39
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 17
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 41
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 19
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 43
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 21
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 45
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 23
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 47
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p2p1",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.0",
-                    "switch_port": "port0/4",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "4e:2e:a5:ab:7f:4b",
-                            "pci": "0000:44:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "a6:43:f6:4f:b6:ea",
-                            "pci": "0000:44:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "b2:fe:29:81:71:0a",
-                            "pci": "0000:44:10.4",
-                            "source_name": 2,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "aa:9d:13:62:80:e5",
-                            "pci": "0000:44:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "3a:30:7f:c6:67:04",
-                            "pci": "0000:44:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "c6:20:45:8f:30:08",
-                            "pci": "0000:44:11.2",
-                            "source_name": 5,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "66:3d:09:bc:d6:32",
-                            "pci": "0000:44:11.4",
-                            "source_name": 6,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "46:e5:0c:f6:c4:ae",
-                            "pci": "0000:44:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:14"
-                },
-                {
-                    "source_name": "p2p2",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.1",
-                    "switch_port": "port0/5",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "ea:b6:5d:98:d9:86",
-                            "pci": "0000:44:10.1",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "36:4c:31:5a:5f:66",
-                            "pci": "0000:44:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "42:a0:5d:fa:8d:8c",
-                            "pci": "0000:44:10.5",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "c6:50:23:c5:53:ff",
-                            "pci": "0000:44:10.7",
-                            "source_name": 3,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "12:2e:6c:79:a3:cc",
-                            "pci": "0000:44:11.1",
-                            "source_name": 4,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "be:f0:8e:7b:50:46",
-                            "pci": "0000:44:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "6e:6e:15:44:1c:1d",
-                            "pci": "0000:44:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "9a:e8:1e:e6:af:31",
-                            "pci": "0000:44:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:16"
-                },
-                {
-                    "source_name": "p3p2",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.1",
-                    "switch_port": "port0/7",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "2e:b7:dc:aa:9a:35",
-                            "pci": "0000:43:10.1",
-                            "source_name": 0,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "42:71:39:50:92:a5",
-                            "pci": "0000:43:10.3",
-                            "source_name": 1,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "22:ac:a0:64:a4:00",
-                            "pci": "0000:43:10.5",
-                            "source_name": 2,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "7e:81:e0:56:c0:aa",
-                            "pci": "0000:43:10.7",
-                            "source_name": 3,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "de:87:8d:ed:81:1a",
-                            "pci": "0000:43:11.1",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "fe:29:e9:da:45:df",
-                            "pci": "0000:43:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "b6:e7:67:46:22:de",
-                            "pci": "0000:43:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "5e:9e:10:7a:66:e9",
-                            "pci": "0000:43:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:0a"
-                },
-                {
-                    "source_name": "p3p1",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.0",
-                    "switch_port": "port0/6",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "5e:2e:05:67:7b:05",
-                            "pci": "0000:43:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "fa:a4:01:f0:7e:d4",
-                            "pci": "0000:43:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "32:aa:7b:9a:e3:6b",
-                            "pci": "0000:43:10.4",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "fa:8d:b3:2f:a6:59",
-                            "pci": "0000:43:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "f2:92:f3:f0:ba:06",
-                            "pci": "0000:43:11.0",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "c2:8a:1b:55:13:52",
-                            "pci": "0000:43:11.2",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "5a:55:8e:f4:a5:4f",
-                            "pci": "0000:43:11.4",
-                            "source_name": 6,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "8a:21:a1:bb:d4:b2",
-                            "pci": "0000:43:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:08"
-                }
-            ],
-            "numa_socket": 1,
-            "hugepages": 28,
-            "memory": 32
-        },
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 0,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 24,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 2
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 26
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 4
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 28
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 6
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 30
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 8
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 32
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 10
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 34
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 12
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 36
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 14
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 38
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 16
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 40
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 18
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 42
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 20
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 44
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 22
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 46
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p5p1",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.0",
-                    "switch_port": "port0/8",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "46:28:47:80:9d:fe",
-                            "pci": "0000:04:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "5a:5d:cb:52:93:66",
-                            "pci": "0000:04:10.2",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "42:42:2e:2d:44:9d",
-                            "pci": "0000:04:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "4a:ef:c2:a5:c8:ad",
-                            "pci": "0000:04:10.6",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "0a:0c:b1:8b:da:c6",
-                            "pci": "0000:04:11.0",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "46:e7:85:ad:1f:3e",
-                            "pci": "0000:04:11.2",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "5e:a4:8f:8f:b0:53",
-                            "pci": "0000:04:11.4",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "d2:76:f2:21:fb:42",
-                            "pci": "0000:04:11.6",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:09:6c"
-                },
-                {
-                    "source_name": "p5p2",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.1",
-                    "switch_port": "port0/9",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "f2:c8:15:59:9d:9e",
-                            "pci": "0000:04:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "ca:30:b2:c2:d9:d6",
-                            "pci": "0000:04:10.3",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "1a:03:de:f7:f5:db",
-                            "pci": "0000:04:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "ca:6d:e0:c3:1e:f5",
-                            "pci": "0000:04:10.7",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "aa:35:ab:70:29:5c",
-                            "pci": "0000:04:11.1",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "02:b3:c4:a6:12:df",
-                            "pci": "0000:04:11.3",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "52:4f:13:67:d5:1f",
-                            "pci": "0000:04:11.5",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "3a:7f:b2:58:61:81",
-                            "pci": "0000:04:11.7",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:09:6e"
-                },
-                {
-                    "source_name": "p7p1",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.0",
-                    "switch_port": "port0/10",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "6e:51:ee:3c:66:fa",
-                            "pci": "0000:06:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "26:0c:7a:db:9b:7e",
-                            "pci": "0000:06:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "66:b0:59:cf:6b:fc",
-                            "pci": "0000:06:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "f6:52:a5:ff:97:b9",
-                            "pci": "0000:06:10.6",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "4a:5c:b2:6a:25:15",
-                            "pci": "0000:06:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "86:0f:85:c2:42:b1",
-                            "pci": "0000:06:11.2",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "b2:3d:24:1d:3e:40",
-                            "pci": "0000:06:11.4",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "ca:3f:fc:7b:32:36",
-                            "pci": "0000:06:11.6",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:0c:d4"
-                },
-                {
-                    "source_name": "p7p2",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.1",
-                    "switch_port": "port0/11",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "76:28:ae:b5:31:25",
-                            "pci": "0000:06:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "5e:fa:d1:f7:eb:44",
-                            "pci": "0000:06:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "56:d3:6a:b0:af:2e",
-                            "pci": "0000:06:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "3e:75:f3:00:aa:ba",
-                            "pci": "0000:06:10.7",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "5e:fd:b0:e2:59:47",
-                            "pci": "0000:06:11.1",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "ee:a7:2f:ab:73:0f",
-                            "pci": "0000:06:11.3",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "d6:e9:f1:c6:40:00",
-                            "pci": "0000:06:11.5",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "36:b0:af:0e:5b:68",
-                            "pci": "0000:06:11.7",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:0c:d6"
-                }
-            ],
-            "numa_socket": 0,
-            "hugepages": 28,
-            "memory": 32
-        }
-    ]
-}
-}
diff --git a/test/hosts/host-example1.yaml b/test/hosts/host-example1.yaml
new file mode 100644 (file)
index 0000000..acbd7db
--- /dev/null
@@ -0,0 +1,459 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
+---
+host:
+  name: fake-host-1
+  user: user
+  password: password
+  ip_name: fakehost1
+host-data:
+  name: fake-host-1
+  ranking: 300
+  description: fake host 1 for test mode
+  ip_name: fakehost1
+  features: lps,dioc,hwsv,ht,64b,tlbps
+  user: user
+  password: password
+  numas:
+  - cores:
+    - core_id: 0
+      thread_id: 1
+      status: noteligible
+    - core_id: 0
+      thread_id: 25
+      status: noteligible
+    - core_id: 1
+      thread_id: 3
+    - core_id: 1
+      thread_id: 27
+    - core_id: 2
+      thread_id: 5
+    - core_id: 2
+      thread_id: 29
+    - core_id: 3
+      thread_id: 7
+    - core_id: 3
+      thread_id: 31
+    - core_id: 4
+      thread_id: 9
+    - core_id: 4
+      thread_id: 33
+    - core_id: 5
+      thread_id: 11
+    - core_id: 5
+      thread_id: 35
+    - core_id: 6
+      thread_id: 13
+    - core_id: 6
+      thread_id: 37
+    - core_id: 7
+      thread_id: 15
+    - core_id: 7
+      thread_id: 39
+    - core_id: 8
+      thread_id: 17
+    - core_id: 8
+      thread_id: 41
+    - core_id: 9
+      thread_id: 19
+    - core_id: 9
+      thread_id: 43
+    - core_id: 10
+      thread_id: 21
+    - core_id: 10
+      thread_id: 45
+    - core_id: 11
+      thread_id: 23
+    - core_id: 11
+      thread_id: 47
+    interfaces:
+    - source_name: p2p1
+      Mbps: 10000
+      pci: '0000:44:00.0'
+      switch_port: port0/4
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 4e:2e:a5:ab:7f:4b
+        pci: '0000:44:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: a6:43:f6:4f:b6:ea
+        pci: '0000:44:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: b2:fe:29:81:71:0a
+        pci: '0000:44:10.4'
+        source_name: 2
+        vlan: 104
+      - mac: aa:9d:13:62:80:e5
+        pci: '0000:44:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: 3a:30:7f:c6:67:04
+        pci: '0000:44:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: c6:20:45:8f:30:08
+        pci: '0000:44:11.2'
+        source_name: 5
+        vlan: 100
+      - mac: 66:3d:09:bc:d6:32
+        pci: '0000:44:11.4'
+        source_name: 6
+        vlan: 105
+      - mac: 46:e5:0c:f6:c4:ae
+        pci: '0000:44:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:35:ed:14
+    - source_name: p2p2
+      Mbps: 10000
+      pci: '0000:44:00.1'
+      switch_port: port0/5
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: ea:b6:5d:98:d9:86
+        pci: '0000:44:10.1'
+        source_name: 0
+        vlan: 102
+      - mac: 36:4c:31:5a:5f:66
+        pci: '0000:44:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: 42:a0:5d:fa:8d:8c
+        pci: '0000:44:10.5'
+        source_name: 2
+        vlan: 100
+      - mac: c6:50:23:c5:53:ff
+        pci: '0000:44:10.7'
+        source_name: 3
+        vlan: 104
+      - mac: 12:2e:6c:79:a3:cc
+        pci: '0000:44:11.1'
+        source_name: 4
+        vlan: 101
+      - mac: be:f0:8e:7b:50:46
+        pci: '0000:44:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: 6e:6e:15:44:1c:1d
+        pci: '0000:44:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: 9a:e8:1e:e6:af:31
+        pci: '0000:44:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:35:ed:16
+    - source_name: p3p2
+      Mbps: 10000
+      pci: '0000:43:00.1'
+      switch_port: port0/7
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 2e:b7:dc:aa:9a:35
+        pci: '0000:43:10.1'
+        source_name: 0
+        vlan: 103
+      - mac: 42:71:39:50:92:a5
+        pci: '0000:43:10.3'
+        source_name: 1
+        vlan: 100
+      - mac: 22:ac:a0:64:a4:00
+        pci: '0000:43:10.5'
+        source_name: 2
+        vlan: 101
+      - mac: 7e:81:e0:56:c0:aa
+        pci: '0000:43:10.7'
+        source_name: 3
+        vlan: 102
+      - mac: de:87:8d:ed:81:1a
+        pci: '0000:43:11.1'
+        source_name: 4
+        vlan: 104
+      - mac: fe:29:e9:da:45:df
+        pci: '0000:43:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: b6:e7:67:46:22:de
+        pci: '0000:43:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: 5e:9e:10:7a:66:e9
+        pci: '0000:43:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:35:ed:0a
+    - source_name: p3p1
+      Mbps: 10000
+      pci: '0000:43:00.0'
+      switch_port: port0/6
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 5e:2e:05:67:7b:05
+        pci: '0000:43:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: fa:a4:01:f0:7e:d4
+        pci: '0000:43:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: 32:aa:7b:9a:e3:6b
+        pci: '0000:43:10.4'
+        source_name: 2
+        vlan: 100
+      - mac: fa:8d:b3:2f:a6:59
+        pci: '0000:43:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: f2:92:f3:f0:ba:06
+        pci: '0000:43:11.0'
+        source_name: 4
+        vlan: 104
+      - mac: c2:8a:1b:55:13:52
+        pci: '0000:43:11.2'
+        source_name: 5
+        vlan: 105
+      - mac: 5a:55:8e:f4:a5:4f
+        pci: '0000:43:11.4'
+        source_name: 6
+        vlan: 107
+      - mac: 8a:21:a1:bb:d4:b2
+        pci: '0000:43:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:35:ed:08
+    numa_socket: 1
+    hugepages: 28
+    memory: 32
+  - cores:
+    - core_id: 0
+      thread_id: 0
+      status: noteligible
+    - core_id: 0
+      thread_id: 24
+      status: noteligible
+    - core_id: 1
+      thread_id: 2
+    - core_id: 1
+      thread_id: 26
+    - core_id: 2
+      thread_id: 4
+    - core_id: 2
+      thread_id: 28
+    - core_id: 3
+      thread_id: 6
+    - core_id: 3
+      thread_id: 30
+    - core_id: 4
+      thread_id: 8
+    - core_id: 4
+      thread_id: 32
+    - core_id: 5
+      thread_id: 10
+    - core_id: 5
+      thread_id: 34
+    - core_id: 6
+      thread_id: 12
+    - core_id: 6
+      thread_id: 36
+    - core_id: 7
+      thread_id: 14
+    - core_id: 7
+      thread_id: 38
+    - core_id: 8
+      thread_id: 16
+    - core_id: 8
+      thread_id: 40
+    - core_id: 9
+      thread_id: 18
+    - core_id: 9
+      thread_id: 42
+    - core_id: 10
+      thread_id: 20
+    - core_id: 10
+      thread_id: 44
+    - core_id: 11
+      thread_id: 22
+    - core_id: 11
+      thread_id: 46
+    interfaces:
+    - source_name: p5p1
+      Mbps: 10000
+      pci: '0000:04:00.0'
+      switch_port: port0/8
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 46:28:47:80:9d:fe
+        pci: '0000:04:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 5a:5d:cb:52:93:66
+        pci: '0000:04:10.2'
+        source_name: 1
+        vlan: 105
+      - mac: 42:42:2e:2d:44:9d
+        pci: '0000:04:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: 4a:ef:c2:a5:c8:ad
+        pci: '0000:04:10.6'
+        source_name: 3
+        vlan: 107
+      - mac: 0a:0c:b1:8b:da:c6
+        pci: '0000:04:11.0'
+        source_name: 4
+        vlan: 102
+      - mac: 46:e7:85:ad:1f:3e
+        pci: '0000:04:11.2'
+        source_name: 5
+        vlan: 103
+      - mac: 5e:a4:8f:8f:b0:53
+        pci: '0000:04:11.4'
+        source_name: 6
+        vlan: 100
+      - mac: d2:76:f2:21:fb:42
+        pci: '0000:04:11.6'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:33:09:6c
+    - source_name: p5p2
+      Mbps: 10000
+      pci: '0000:04:00.1'
+      switch_port: port0/9
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: f2:c8:15:59:9d:9e
+        pci: '0000:04:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: ca:30:b2:c2:d9:d6
+        pci: '0000:04:10.3'
+        source_name: 1
+        vlan: 105
+      - mac: 1a:03:de:f7:f5:db
+        pci: '0000:04:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: ca:6d:e0:c3:1e:f5
+        pci: '0000:04:10.7'
+        source_name: 3
+        vlan: 107
+      - mac: aa:35:ab:70:29:5c
+        pci: '0000:04:11.1'
+        source_name: 4
+        vlan: 102
+      - mac: 02:b3:c4:a6:12:df
+        pci: '0000:04:11.3'
+        source_name: 5
+        vlan: 103
+      - mac: 52:4f:13:67:d5:1f
+        pci: '0000:04:11.5'
+        source_name: 6
+        vlan: 100
+      - mac: 3a:7f:b2:58:61:81
+        pci: '0000:04:11.7'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:33:09:6e
+    - source_name: p7p1
+      Mbps: 10000
+      pci: '0000:06:00.0'
+      switch_port: port0/10
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 6e:51:ee:3c:66:fa
+        pci: '0000:06:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 26:0c:7a:db:9b:7e
+        pci: '0000:06:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: 66:b0:59:cf:6b:fc
+        pci: '0000:06:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: f6:52:a5:ff:97:b9
+        pci: '0000:06:10.6'
+        source_name: 3
+        vlan: 105
+      - mac: 4a:5c:b2:6a:25:15
+        pci: '0000:06:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: 86:0f:85:c2:42:b1
+        pci: '0000:06:11.2'
+        source_name: 5
+        vlan: 102
+      - mac: b2:3d:24:1d:3e:40
+        pci: '0000:06:11.4'
+        source_name: 6
+        vlan: 101
+      - mac: ca:3f:fc:7b:32:36
+        pci: '0000:06:11.6'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:33:0c:d4
+    - source_name: p7p2
+      Mbps: 10000
+      pci: '0000:06:00.1'
+      switch_port: port0/11
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 76:28:ae:b5:31:25
+        pci: '0000:06:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: 5e:fa:d1:f7:eb:44
+        pci: '0000:06:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: 56:d3:6a:b0:af:2e
+        pci: '0000:06:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: 3e:75:f3:00:aa:ba
+        pci: '0000:06:10.7'
+        source_name: 3
+        vlan: 105
+      - mac: 5e:fd:b0:e2:59:47
+        pci: '0000:06:11.1'
+        source_name: 4
+        vlan: 107
+      - mac: ee:a7:2f:ab:73:0f
+        pci: '0000:06:11.3'
+        source_name: 5
+        vlan: 102
+      - mac: d6:e9:f1:c6:40:00
+        pci: '0000:06:11.5'
+        source_name: 6
+        vlan: 101
+      - mac: 36:b0:af:0e:5b:68
+        pci: '0000:06:11.7'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:33:0c:d6
+    numa_socket: 0
+    hugepages: 28
+    memory: 32
+
diff --git a/test/hosts/host-example2.json b/test/hosts/host-example2.json
deleted file mode 100644 (file)
index ddda8f7..0000000
+++ /dev/null
@@ -1,698 +0,0 @@
-{
-    "host":{
-        "name": "fake-host-2",
-        "user": "user", 
-        "password": "password", 
-        "ip_name": "fakehost2" 
-    },
-"host-data":
-{
-    "name": "fake-host-2",
-    "ranking": 300,
-    "description": "fake host 2 for test mode",
-    "ip_name": "fakehost2",
-    "features": "lps,dioc,hwsv,ht,64b,tlbps",
-    "user": "user",
-    "password": "password",
-    "numas": [
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 1,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 25,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 3
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 27
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 5
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 29
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 7
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 31
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 9
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 33
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 11
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 35
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 13
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 37
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 15
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 39
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 17
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 41
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 19
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 43
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 21
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 45
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 23
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 47
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p2p1",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.0",
-                    "switch_port": "port0/12",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "fe:49:52:59:2f:0b",
-                            "pci": "0000:44:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "16:df:ee:65:d1:a9",
-                            "pci": "0000:44:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "e6:10:3a:09:cc:eb",
-                            "pci": "0000:44:10.4",
-                            "source_name": 2,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "f6:8e:ef:92:70:9a",
-                            "pci": "0000:44:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "fa:a5:0e:21:bc:89",
-                            "pci": "0000:44:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "fa:72:5a:b0:07:44",
-                            "pci": "0000:44:11.2",
-                            "source_name": 5,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "3e:8f:5c:1a:5d:e1",
-                            "pci": "0000:44:11.4",
-                            "source_name": 6,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "f2:e0:34:e2:e1:2d",
-                            "pci": "0000:44:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:e9:a0"
-                },
-                {
-                    "source_name": "p2p2",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.1",
-                    "switch_port": "port0/13",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "ba:76:24:e0:79:75",
-                            "pci": "0000:44:10.1",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "b2:26:81:5b:18:7b",
-                            "pci": "0000:44:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "da:46:a9:f4:ab:42",
-                            "pci": "0000:44:10.5",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "86:e0:ec:33:cc:18",
-                            "pci": "0000:44:10.7",
-                            "source_name": 3,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "ee:ee:49:da:20:75",
-                            "pci": "0000:44:11.1",
-                            "source_name": 4,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "be:fa:18:da:f3:ba",
-                            "pci": "0000:44:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "96:fa:8d:ed:50:02",
-                            "pci": "0000:44:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "22:1b:cb:33:a7:5a",
-                            "pci": "0000:44:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:e9:a2"
-                },
-                {
-                    "source_name": "p3p2",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.1",
-                    "switch_port": "port0/15",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "a6:6e:28:6c:5b:04",
-                            "pci": "0000:43:10.1",
-                            "source_name": 0,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "be:35:42:86:3d:fd",
-                            "pci": "0000:43:10.3",
-                            "source_name": 1,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "0a:92:99:92:02:e4",
-                            "pci": "0000:43:10.5",
-                            "source_name": 2,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "b6:a6:3a:f1:1e:57",
-                            "pci": "0000:43:10.7",
-                            "source_name": 3,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "be:3f:1a:ef:76:c0",
-                            "pci": "0000:43:11.1",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "6a:cc:a6:bf:61:cd",
-                            "pci": "0000:43:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "fe:c1:15:a9:c5:12",
-                            "pci": "0000:43:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "6a:ff:59:aa:63:34",
-                            "pci": "0000:43:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:42"
-                },
-                {
-                    "source_name": "p3p1",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.0",
-                    "switch_port": "port0/14",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "c6:18:cb:6c:c4:04",
-                            "pci": "0000:43:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "a6:4e:90:89:90:d8",
-                            "pci": "0000:43:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "fe:9a:82:91:a5:3a",
-                            "pci": "0000:43:10.4",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "22:a3:ef:27:50:fd",
-                            "pci": "0000:43:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "c6:57:98:69:67:e2",
-                            "pci": "0000:43:11.0",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "6a:f9:81:ae:40:94",
-                            "pci": "0000:43:11.2",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "86:00:37:7f:6e:05",
-                            "pci": "0000:43:11.4",
-                            "source_name": 6,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "f2:e6:fc:7d:71:9b",
-                            "pci": "0000:43:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:35:ed:40"
-                }
-            ],
-            "numa_socket": 1,
-            "hugepages": 60,
-            "memory": 64
-        },
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 0,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 24,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 2
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 26
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 4
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 28
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 6
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 30
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 8
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 32
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 10
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 34
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 12
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 36
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 14
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 38
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 16
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 40
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 18
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 42
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 20
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 44
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 22
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 46
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p5p1",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.0",
-                    "switch_port": "port0/16",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "02:ef:c9:38:c7:01",
-                            "pci": "0000:04:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "92:04:e9:fe:c7:f9",
-                            "pci": "0000:04:10.2",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "a2:41:32:78:25:48",
-                            "pci": "0000:04:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "9e:65:ab:e8:a0:2b",
-                            "pci": "0000:04:10.6",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "0a:38:88:4c:76:1b",
-                            "pci": "0000:04:11.0",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "4e:8f:96:e1:d2:99",
-                            "pci": "0000:04:11.2",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "62:b3:0a:15:1b:cc",
-                            "pci": "0000:04:11.4",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "fa:29:6a:04:c3:fc",
-                            "pci": "0000:04:11.6",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:16:f4"
-                },
-                {
-                    "source_name": "p5p2",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.1",
-                    "switch_port": "port0/17",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "1a:07:7d:f5:ab:bf",
-                            "pci": "0000:04:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "12:63:9b:75:5c:02",
-                            "pci": "0000:04:10.3",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "be:f8:54:de:8e:39",
-                            "pci": "0000:04:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "82:bb:12:83:82:b9",
-                            "pci": "0000:04:10.7",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "06:5c:e3:40:c3:e0",
-                            "pci": "0000:04:11.1",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "32:54:10:77:36:d1",
-                            "pci": "0000:04:11.3",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "0e:0f:3f:23:d6:17",
-                            "pci": "0000:04:11.5",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "46:14:84:51:3d:ec",
-                            "pci": "0000:04:11.7",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:16:f6"
-                },
-                {
-                    "source_name": "p7p1",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.0",
-                    "switch_port": "port0/18",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "d6:8a:a7:27:bc:7c",
-                            "pci": "0000:06:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "9e:f4:67:21:28:12",
-                            "pci": "0000:06:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "b6:f8:b7:c8:ae:07",
-                            "pci": "0000:06:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "0e:e8:34:7a:3b:c4",
-                            "pci": "0000:06:10.6",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "82:5d:0f:7a:20:91",
-                            "pci": "0000:06:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "f2:6b:6a:4a:e3:93",
-                            "pci": "0000:06:11.2",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "b2:d6:af:b0:12:f4",
-                            "pci": "0000:06:11.4",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "22:0b:01:19:dd:3c",
-                            "pci": "0000:06:11.6",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:0f:1c"
-                },
-                {
-                    "source_name": "p7p2",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.1",
-                    "switch_port": "port0/19",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "0a:2f:77:8f:53:da",
-                            "pci": "0000:06:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "a2:f5:63:1d:1c:4d",
-                            "pci": "0000:06:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "86:80:6c:d8:da:e0",
-                            "pci": "0000:06:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "5a:9d:1c:19:3f:07",
-                            "pci": "0000:06:10.7",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "ea:a9:fb:95:29:34",
-                            "pci": "0000:06:11.1",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "0e:3a:e9:65:5b:d3",
-                            "pci": "0000:06:11.3",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "ce:cd:53:c6:7b:ca",
-                            "pci": "0000:06:11.5",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "52:b1:4e:91:34:8c",
-                            "pci": "0000:06:11.7",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:33:0f:1e"
-                }
-            ],
-            "numa_socket": 0,
-            "hugepages": 60,
-            "memory": 64
-        }
-    ]
-}
-}
diff --git a/test/hosts/host-example2.yaml b/test/hosts/host-example2.yaml
new file mode 100644 (file)
index 0000000..6e2ecdd
--- /dev/null
@@ -0,0 +1,459 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
+---
+host:
+  name: fake-host-2
+  user: user
+  password: password
+  ip_name: fakehost2
+host-data:
+  name: fake-host-2
+  ranking: 300
+  description: fake host 2 for test mode
+  ip_name: fakehost2
+  features: lps,dioc,hwsv,ht,64b,tlbps
+  user: user
+  password: password
+  numas:
+  - cores:
+    - core_id: 0
+      thread_id: 1
+      status: noteligible
+    - core_id: 0
+      thread_id: 25
+      status: noteligible
+    - core_id: 1
+      thread_id: 3
+    - core_id: 1
+      thread_id: 27
+    - core_id: 2
+      thread_id: 5
+    - core_id: 2
+      thread_id: 29
+    - core_id: 3
+      thread_id: 7
+    - core_id: 3
+      thread_id: 31
+    - core_id: 4
+      thread_id: 9
+    - core_id: 4
+      thread_id: 33
+    - core_id: 5
+      thread_id: 11
+    - core_id: 5
+      thread_id: 35
+    - core_id: 6
+      thread_id: 13
+    - core_id: 6
+      thread_id: 37
+    - core_id: 7
+      thread_id: 15
+    - core_id: 7
+      thread_id: 39
+    - core_id: 8
+      thread_id: 17
+    - core_id: 8
+      thread_id: 41
+    - core_id: 9
+      thread_id: 19
+    - core_id: 9
+      thread_id: 43
+    - core_id: 10
+      thread_id: 21
+    - core_id: 10
+      thread_id: 45
+    - core_id: 11
+      thread_id: 23
+    - core_id: 11
+      thread_id: 47
+    interfaces:
+    - source_name: p2p1
+      Mbps: 10000
+      pci: '0000:44:00.0'
+      switch_port: port0/12
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: fe:49:52:59:2f:0b
+        pci: '0000:44:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: 16:df:ee:65:d1:a9
+        pci: '0000:44:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: e6:10:3a:09:cc:eb
+        pci: '0000:44:10.4'
+        source_name: 2
+        vlan: 104
+      - mac: f6:8e:ef:92:70:9a
+        pci: '0000:44:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: fa:a5:0e:21:bc:89
+        pci: '0000:44:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: fa:72:5a:b0:07:44
+        pci: '0000:44:11.2'
+        source_name: 5
+        vlan: 100
+      - mac: 3e:8f:5c:1a:5d:e1
+        pci: '0000:44:11.4'
+        source_name: 6
+        vlan: 105
+      - mac: f2:e0:34:e2:e1:2d
+        pci: '0000:44:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:35:e9:a0
+    - source_name: p2p2
+      Mbps: 10000
+      pci: '0000:44:00.1'
+      switch_port: port0/13
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: ba:76:24:e0:79:75
+        pci: '0000:44:10.1'
+        source_name: 0
+        vlan: 102
+      - mac: b2:26:81:5b:18:7b
+        pci: '0000:44:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: da:46:a9:f4:ab:42
+        pci: '0000:44:10.5'
+        source_name: 2
+        vlan: 100
+      - mac: 86:e0:ec:33:cc:18
+        pci: '0000:44:10.7'
+        source_name: 3
+        vlan: 104
+      - mac: ee:ee:49:da:20:75
+        pci: '0000:44:11.1'
+        source_name: 4
+        vlan: 101
+      - mac: be:fa:18:da:f3:ba
+        pci: '0000:44:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: 96:fa:8d:ed:50:02
+        pci: '0000:44:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: 22:1b:cb:33:a7:5a
+        pci: '0000:44:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:35:e9:a2
+    - source_name: p3p2
+      Mbps: 10000
+      pci: '0000:43:00.1'
+      switch_port: port0/15
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: a6:6e:28:6c:5b:04
+        pci: '0000:43:10.1'
+        source_name: 0
+        vlan: 103
+      - mac: be:35:42:86:3d:fd
+        pci: '0000:43:10.3'
+        source_name: 1
+        vlan: 100
+      - mac: 0a:92:99:92:02:e4
+        pci: '0000:43:10.5'
+        source_name: 2
+        vlan: 101
+      - mac: b6:a6:3a:f1:1e:57
+        pci: '0000:43:10.7'
+        source_name: 3
+        vlan: 102
+      - mac: be:3f:1a:ef:76:c0
+        pci: '0000:43:11.1'
+        source_name: 4
+        vlan: 104
+      - mac: 6a:cc:a6:bf:61:cd
+        pci: '0000:43:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: fe:c1:15:a9:c5:12
+        pci: '0000:43:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: 6a:ff:59:aa:63:34
+        pci: '0000:43:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:35:ed:42
+    - source_name: p3p1
+      Mbps: 10000
+      pci: '0000:43:00.0'
+      switch_port: port0/14
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: c6:18:cb:6c:c4:04
+        pci: '0000:43:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: a6:4e:90:89:90:d8
+        pci: '0000:43:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: fe:9a:82:91:a5:3a
+        pci: '0000:43:10.4'
+        source_name: 2
+        vlan: 100
+      - mac: 22:a3:ef:27:50:fd
+        pci: '0000:43:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: c6:57:98:69:67:e2
+        pci: '0000:43:11.0'
+        source_name: 4
+        vlan: 104
+      - mac: 6a:f9:81:ae:40:94
+        pci: '0000:43:11.2'
+        source_name: 5
+        vlan: 105
+      - mac: 86:00:37:7f:6e:05
+        pci: '0000:43:11.4'
+        source_name: 6
+        vlan: 107
+      - mac: f2:e6:fc:7d:71:9b
+        pci: '0000:43:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:35:ed:40
+    numa_socket: 1
+    hugepages: 60
+    memory: 64
+  - cores:
+    - core_id: 0
+      thread_id: 0
+      status: noteligible
+    - core_id: 0
+      thread_id: 24
+      status: noteligible
+    - core_id: 1
+      thread_id: 2
+    - core_id: 1
+      thread_id: 26
+    - core_id: 2
+      thread_id: 4
+    - core_id: 2
+      thread_id: 28
+    - core_id: 3
+      thread_id: 6
+    - core_id: 3
+      thread_id: 30
+    - core_id: 4
+      thread_id: 8
+    - core_id: 4
+      thread_id: 32
+    - core_id: 5
+      thread_id: 10
+    - core_id: 5
+      thread_id: 34
+    - core_id: 6
+      thread_id: 12
+    - core_id: 6
+      thread_id: 36
+    - core_id: 7
+      thread_id: 14
+    - core_id: 7
+      thread_id: 38
+    - core_id: 8
+      thread_id: 16
+    - core_id: 8
+      thread_id: 40
+    - core_id: 9
+      thread_id: 18
+    - core_id: 9
+      thread_id: 42
+    - core_id: 10
+      thread_id: 20
+    - core_id: 10
+      thread_id: 44
+    - core_id: 11
+      thread_id: 22
+    - core_id: 11
+      thread_id: 46
+    interfaces:
+    - source_name: p5p1
+      Mbps: 10000
+      pci: '0000:04:00.0'
+      switch_port: port0/16
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 02:ef:c9:38:c7:01
+        pci: '0000:04:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 92:04:e9:fe:c7:f9
+        pci: '0000:04:10.2'
+        source_name: 1
+        vlan: 105
+      - mac: a2:41:32:78:25:48
+        pci: '0000:04:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: 9e:65:ab:e8:a0:2b
+        pci: '0000:04:10.6'
+        source_name: 3
+        vlan: 107
+      - mac: 0a:38:88:4c:76:1b
+        pci: '0000:04:11.0'
+        source_name: 4
+        vlan: 102
+      - mac: 4e:8f:96:e1:d2:99
+        pci: '0000:04:11.2'
+        source_name: 5
+        vlan: 103
+      - mac: 62:b3:0a:15:1b:cc
+        pci: '0000:04:11.4'
+        source_name: 6
+        vlan: 100
+      - mac: fa:29:6a:04:c3:fc
+        pci: '0000:04:11.6'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:33:16:f4
+    - source_name: p5p2
+      Mbps: 10000
+      pci: '0000:04:00.1'
+      switch_port: port0/17
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 1a:07:7d:f5:ab:bf
+        pci: '0000:04:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: 12:63:9b:75:5c:02
+        pci: '0000:04:10.3'
+        source_name: 1
+        vlan: 105
+      - mac: be:f8:54:de:8e:39
+        pci: '0000:04:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: 82:bb:12:83:82:b9
+        pci: '0000:04:10.7'
+        source_name: 3
+        vlan: 107
+      - mac: 06:5c:e3:40:c3:e0
+        pci: '0000:04:11.1'
+        source_name: 4
+        vlan: 102
+      - mac: 32:54:10:77:36:d1
+        pci: '0000:04:11.3'
+        source_name: 5
+        vlan: 103
+      - mac: 0e:0f:3f:23:d6:17
+        pci: '0000:04:11.5'
+        source_name: 6
+        vlan: 100
+      - mac: 46:14:84:51:3d:ec
+        pci: '0000:04:11.7'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:33:16:f6
+    - source_name: p7p1
+      Mbps: 10000
+      pci: '0000:06:00.0'
+      switch_port: port0/18
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: d6:8a:a7:27:bc:7c
+        pci: '0000:06:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 9e:f4:67:21:28:12
+        pci: '0000:06:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: b6:f8:b7:c8:ae:07
+        pci: '0000:06:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: 0e:e8:34:7a:3b:c4
+        pci: '0000:06:10.6'
+        source_name: 3
+        vlan: 105
+      - mac: 82:5d:0f:7a:20:91
+        pci: '0000:06:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: f2:6b:6a:4a:e3:93
+        pci: '0000:06:11.2'
+        source_name: 5
+        vlan: 102
+      - mac: b2:d6:af:b0:12:f4
+        pci: '0000:06:11.4'
+        source_name: 6
+        vlan: 101
+      - mac: 22:0b:01:19:dd:3c
+        pci: '0000:06:11.6'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:33:0f:1c
+    - source_name: p7p2
+      Mbps: 10000
+      pci: '0000:06:00.1'
+      switch_port: port0/19
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 0a:2f:77:8f:53:da
+        pci: '0000:06:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: a2:f5:63:1d:1c:4d
+        pci: '0000:06:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: 86:80:6c:d8:da:e0
+        pci: '0000:06:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: 5a:9d:1c:19:3f:07
+        pci: '0000:06:10.7'
+        source_name: 3
+        vlan: 105
+      - mac: ea:a9:fb:95:29:34
+        pci: '0000:06:11.1'
+        source_name: 4
+        vlan: 107
+      - mac: 0e:3a:e9:65:5b:d3
+        pci: '0000:06:11.3'
+        source_name: 5
+        vlan: 102
+      - mac: ce:cd:53:c6:7b:ca
+        pci: '0000:06:11.5'
+        source_name: 6
+        vlan: 101
+      - mac: 52:b1:4e:91:34:8c
+        pci: '0000:06:11.7'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:33:0f:1e
+    numa_socket: 0
+    hugepages: 60
+    memory: 64
+
diff --git a/test/hosts/host-example3.json b/test/hosts/host-example3.json
deleted file mode 100644 (file)
index a115e45..0000000
+++ /dev/null
@@ -1,698 +0,0 @@
-{
-    "host":{
-        "name": "fake-host-3",
-        "user": "user", 
-        "password": "password", 
-        "ip_name": "fakehost3" 
-    },
-"host-data":
-{
-    "name": "fake-host-3",
-    "ranking": 300,
-    "description": "fake host 3 for test mode",
-    "ip_name": "fakehost3",
-    "features": "lps,dioc,hwsv,ht,64b,tlbps",
-    "user": "user",
-    "password": "password",
-    "numas": [
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 1,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 25,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 3
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 27
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 5
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 29
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 7
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 31
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 9
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 33
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 11
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 35
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 13
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 37
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 15
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 39
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 17
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 41
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 19
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 43
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 21
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 45
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 23
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 47
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p2p1",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.0",
-                    "switch_port": "port1/0",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "ce:24:06:7d:7a:5b",
-                            "pci": "0000:44:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "a6:2d:10:75:dc:06",
-                            "pci": "0000:44:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "4a:39:f1:d1:aa:46",
-                            "pci": "0000:44:10.4",
-                            "source_name": 2,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "ee:df:34:b3:cf:50",
-                            "pci": "0000:44:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "46:02:47:d8:f5:66",
-                            "pci": "0000:44:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "a6:11:78:97:b4:ab",
-                            "pci": "0000:44:11.2",
-                            "source_name": 5,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "36:c0:13:a4:4c:77",
-                            "pci": "0000:44:11.4",
-                            "source_name": 6,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "b6:3b:b5:43:3a:44",
-                            "pci": "0000:44:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:25:97:f4"
-                },
-                {
-                    "source_name": "p2p2",
-                    "Mbps": 10000,
-                    "pci": "0000:44:00.1",
-                    "switch_port": "port1/1",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "f6:38:e9:5e:f9:42",
-                            "pci": "0000:44:10.1",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "f6:1e:b9:d3:15:69",
-                            "pci": "0000:44:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "2e:22:7f:44:86:e0",
-                            "pci": "0000:44:10.5",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "5a:3f:db:66:d6:90",
-                            "pci": "0000:44:10.7",
-                            "source_name": 3,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "b2:05:b8:f3:ae:20",
-                            "pci": "0000:44:11.1",
-                            "source_name": 4,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "fa:fe:24:82:12:b5",
-                            "pci": "0000:44:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "36:2a:0e:cb:29:01",
-                            "pci": "0000:44:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "46:71:c0:8a:9c:48",
-                            "pci": "0000:44:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:25:97:f6"
-                },
-                {
-                    "source_name": "p3p2",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.1",
-                    "switch_port": "port1/3",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "72:fd:7a:af:91:57",
-                            "pci": "0000:43:10.1",
-                            "source_name": 0,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "fa:c4:d7:e1:3b:07",
-                            "pci": "0000:43:10.3",
-                            "source_name": 1,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "c2:03:28:4a:0a:8e",
-                            "pci": "0000:43:10.5",
-                            "source_name": 2,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "66:1b:78:65:67:e2",
-                            "pci": "0000:43:10.7",
-                            "source_name": 3,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "be:4b:e9:77:ff:a2",
-                            "pci": "0000:43:11.1",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "02:9a:94:e2:79:c0",
-                            "pci": "0000:43:11.3",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "b2:80:62:dd:09:ea",
-                            "pci": "0000:43:11.5",
-                            "source_name": 6,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "ea:41:30:8e:af:b9",
-                            "pci": "0000:43:11.7",
-                            "source_name": 7,
-                            "vlan": 107
-                        }
-                    ],
-                    "mac": "a0:36:9f:25:97:de"
-                },
-                {
-                    "source_name": "p3p1",
-                    "Mbps": 10000,
-                    "pci": "0000:43:00.0",
-                    "switch_port": "port1/2",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "66:80:a0:55:83:93",
-                            "pci": "0000:43:10.0",
-                            "source_name": 0,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "fe:fd:72:b8:fe:bb",
-                            "pci": "0000:43:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "6a:70:92:7f:6b:7b",
-                            "pci": "0000:43:10.4",
-                            "source_name": 2,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "3a:14:75:5e:63:15",
-                            "pci": "0000:43:10.6",
-                            "source_name": 3,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "2e:c9:5d:6e:27:48",
-                            "pci": "0000:43:11.0",
-                            "source_name": 4,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "02:f7:bb:82:78:1f",
-                            "pci": "0000:43:11.2",
-                            "source_name": 5,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "0e:5e:b6:a8:6c:80",
-                            "pci": "0000:43:11.4",
-                            "source_name": 6,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "8e:bf:81:bc:cb:44",
-                            "pci": "0000:43:11.6",
-                            "source_name": 7,
-                            "vlan": 106
-                        }
-                    ],
-                    "mac": "a0:36:9f:25:97:dc"
-                }
-            ],
-            "numa_socket": 1,
-            "hugepages": 28,
-            "memory": 32
-        },
-        {
-            "cores": [
-                {
-                    "core_id": 0,
-                    "thread_id": 0,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 0,
-                    "thread_id": 24,
-                    "status": "noteligible"
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 2
-                },
-                {
-                    "core_id": 1,
-                    "thread_id": 26
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 4
-                },
-                {
-                    "core_id": 2,
-                    "thread_id": 28
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 6
-                },
-                {
-                    "core_id": 3,
-                    "thread_id": 30
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 8
-                },
-                {
-                    "core_id": 4,
-                    "thread_id": 32
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 10
-                },
-                {
-                    "core_id": 5,
-                    "thread_id": 34
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 12
-                },
-                {
-                    "core_id": 6,
-                    "thread_id": 36
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 14
-                },
-                {
-                    "core_id": 7,
-                    "thread_id": 38
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 16
-                },
-                {
-                    "core_id": 8,
-                    "thread_id": 40
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 18
-                },
-                {
-                    "core_id": 9,
-                    "thread_id": 42
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 20
-                },
-                {
-                    "core_id": 10,
-                    "thread_id": 44
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 22
-                },
-                {
-                    "core_id": 11,
-                    "thread_id": 46
-                }
-            ],
-            "interfaces": [
-                {
-                    "source_name": "p5p1",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.0",
-                    "switch_port": "port1/4",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "aa:ef:2c:23:ae:04",
-                            "pci": "0000:04:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "2e:d5:b9:3e:c4:8b",
-                            "pci": "0000:04:10.2",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "4e:d6:55:09:17:1e",
-                            "pci": "0000:04:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "ce:42:cc:9c:5a:32",
-                            "pci": "0000:04:10.6",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "1e:71:34:7f:5d:47",
-                            "pci": "0000:04:11.0",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "26:5c:e4:db:8c:48",
-                            "pci": "0000:04:11.2",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "5e:48:23:56:63:c0",
-                            "pci": "0000:04:11.4",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "9a:a2:fa:97:19:84",
-                            "pci": "0000:04:11.6",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:27:46:a0"
-                },
-                {
-                    "source_name": "p5p2",
-                    "Mbps": 10000,
-                    "pci": "0000:04:00.1",
-                    "switch_port": "port1/5",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "0a:9b:b5:d1:e6:34",
-                            "pci": "0000:04:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "5e:87:4a:22:e9:57",
-                            "pci": "0000:04:10.3",
-                            "source_name": 1,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "ea:94:d5:f6:ee:bb",
-                            "pci": "0000:04:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "5a:3f:17:6b:bb:8b",
-                            "pci": "0000:04:10.7",
-                            "source_name": 3,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "8e:af:5c:cc:c8:82",
-                            "pci": "0000:04:11.1",
-                            "source_name": 4,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "3e:a0:df:f0:2b:07",
-                            "pci": "0000:04:11.3",
-                            "source_name": 5,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "ae:7d:00:9b:54:4d",
-                            "pci": "0000:04:11.5",
-                            "source_name": 6,
-                            "vlan": 100
-                        },
-                        {
-                            "mac": "fa:b5:0d:c6:78:87",
-                            "pci": "0000:04:11.7",
-                            "source_name": 7,
-                            "vlan": 101
-                        }
-                    ],
-                    "mac": "a0:36:9f:27:46:a2"
-                },
-                {
-                    "source_name": "p7p1",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.0",
-                    "switch_port": "port1/6",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "22:4a:21:37:84:80",
-                            "pci": "0000:06:10.0",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "b2:8f:2c:04:08:08",
-                            "pci": "0000:06:10.2",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "fe:2e:71:1f:99:dd",
-                            "pci": "0000:06:10.4",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "1a:2c:7c:98:39:b6",
-                            "pci": "0000:06:10.6",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "6e:39:08:a9:7e:b1",
-                            "pci": "0000:06:11.0",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "4a:00:f3:5b:15:27",
-                            "pci": "0000:06:11.2",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "b2:c3:48:da:24:55",
-                            "pci": "0000:06:11.4",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "72:85:cd:18:ee:5d",
-                            "pci": "0000:06:11.6",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:27:45:80"
-                },
-                {
-                    "source_name": "p7p2",
-                    "Mbps": 10000,
-                    "pci": "0000:06:00.1",
-                    "switch_port": "port1/7",
-                    "switch_dpid": "00:01:02:03:04:05:06:07",
-                    "sriovs": [
-                        {
-                            "mac": "0a:60:1a:9d:ba:e2",
-                            "pci": "0000:06:10.1",
-                            "source_name": 0,
-                            "vlan": 104
-                        },
-                        {
-                            "mac": "72:cb:0a:99:2f:7e",
-                            "pci": "0000:06:10.3",
-                            "source_name": 1,
-                            "vlan": 103
-                        },
-                        {
-                            "mac": "f2:2b:6b:d8:95:aa",
-                            "pci": "0000:06:10.5",
-                            "source_name": 2,
-                            "vlan": 106
-                        },
-                        {
-                            "mac": "b2:3a:4a:a8:c9:e9",
-                            "pci": "0000:06:10.7",
-                            "source_name": 3,
-                            "vlan": 105
-                        },
-                        {
-                            "mac": "06:85:75:b1:e8:10",
-                            "pci": "0000:06:11.1",
-                            "source_name": 4,
-                            "vlan": 107
-                        },
-                        {
-                            "mac": "12:41:69:61:89:3a",
-                            "pci": "0000:06:11.3",
-                            "source_name": 5,
-                            "vlan": 102
-                        },
-                        {
-                            "mac": "86:03:a8:5a:ad:71",
-                            "pci": "0000:06:11.5",
-                            "source_name": 6,
-                            "vlan": 101
-                        },
-                        {
-                            "mac": "ca:9c:5c:ad:e2:e2",
-                            "pci": "0000:06:11.7",
-                            "source_name": 7,
-                            "vlan": 100
-                        }
-                    ],
-                    "mac": "a0:36:9f:27:45:82"
-                }
-            ],
-            "numa_socket": 0,
-            "hugepages": 28,
-            "memory": 32
-        }
-    ]
-}
-}
diff --git a/test/hosts/host-example3.yaml b/test/hosts/host-example3.yaml
new file mode 100644 (file)
index 0000000..cdce188
--- /dev/null
@@ -0,0 +1,459 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
+---
+host:
+  name: fake-host-3
+  user: user
+  password: password
+  ip_name: fakehost3
+host-data:
+  name: fake-host-3
+  ranking: 300
+  description: fake host 3 for test mode
+  ip_name: fakehost3
+  features: lps,dioc,hwsv,ht,64b,tlbps
+  user: user
+  password: password
+  numas:
+  - cores:
+    - core_id: 0
+      thread_id: 1
+      status: noteligible
+    - core_id: 0
+      thread_id: 25
+      status: noteligible
+    - core_id: 1
+      thread_id: 3
+    - core_id: 1
+      thread_id: 27
+    - core_id: 2
+      thread_id: 5
+    - core_id: 2
+      thread_id: 29
+    - core_id: 3
+      thread_id: 7
+    - core_id: 3
+      thread_id: 31
+    - core_id: 4
+      thread_id: 9
+    - core_id: 4
+      thread_id: 33
+    - core_id: 5
+      thread_id: 11
+    - core_id: 5
+      thread_id: 35
+    - core_id: 6
+      thread_id: 13
+    - core_id: 6
+      thread_id: 37
+    - core_id: 7
+      thread_id: 15
+    - core_id: 7
+      thread_id: 39
+    - core_id: 8
+      thread_id: 17
+    - core_id: 8
+      thread_id: 41
+    - core_id: 9
+      thread_id: 19
+    - core_id: 9
+      thread_id: 43
+    - core_id: 10
+      thread_id: 21
+    - core_id: 10
+      thread_id: 45
+    - core_id: 11
+      thread_id: 23
+    - core_id: 11
+      thread_id: 47
+    interfaces:
+    - source_name: p2p1
+      Mbps: 10000
+      pci: '0000:44:00.0'
+      switch_port: port1/0
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: ce:24:06:7d:7a:5b
+        pci: '0000:44:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: a6:2d:10:75:dc:06
+        pci: '0000:44:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: 4a:39:f1:d1:aa:46
+        pci: '0000:44:10.4'
+        source_name: 2
+        vlan: 104
+      - mac: ee:df:34:b3:cf:50
+        pci: '0000:44:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: 46:02:47:d8:f5:66
+        pci: '0000:44:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: a6:11:78:97:b4:ab
+        pci: '0000:44:11.2'
+        source_name: 5
+        vlan: 100
+      - mac: 36:c0:13:a4:4c:77
+        pci: '0000:44:11.4'
+        source_name: 6
+        vlan: 105
+      - mac: b6:3b:b5:43:3a:44
+        pci: '0000:44:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:25:97:f4
+    - source_name: p2p2
+      Mbps: 10000
+      pci: '0000:44:00.1'
+      switch_port: port1/1
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: f6:38:e9:5e:f9:42
+        pci: '0000:44:10.1'
+        source_name: 0
+        vlan: 102
+      - mac: f6:1e:b9:d3:15:69
+        pci: '0000:44:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: 2e:22:7f:44:86:e0
+        pci: '0000:44:10.5'
+        source_name: 2
+        vlan: 100
+      - mac: 5a:3f:db:66:d6:90
+        pci: '0000:44:10.7'
+        source_name: 3
+        vlan: 104
+      - mac: b2:05:b8:f3:ae:20
+        pci: '0000:44:11.1'
+        source_name: 4
+        vlan: 101
+      - mac: fa:fe:24:82:12:b5
+        pci: '0000:44:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: 36:2a:0e:cb:29:01
+        pci: '0000:44:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: 46:71:c0:8a:9c:48
+        pci: '0000:44:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:25:97:f6
+    - source_name: p3p2
+      Mbps: 10000
+      pci: '0000:43:00.1'
+      switch_port: port1/3
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 72:fd:7a:af:91:57
+        pci: '0000:43:10.1'
+        source_name: 0
+        vlan: 103
+      - mac: fa:c4:d7:e1:3b:07
+        pci: '0000:43:10.3'
+        source_name: 1
+        vlan: 100
+      - mac: c2:03:28:4a:0a:8e
+        pci: '0000:43:10.5'
+        source_name: 2
+        vlan: 101
+      - mac: 66:1b:78:65:67:e2
+        pci: '0000:43:10.7'
+        source_name: 3
+        vlan: 102
+      - mac: be:4b:e9:77:ff:a2
+        pci: '0000:43:11.1'
+        source_name: 4
+        vlan: 104
+      - mac: 02:9a:94:e2:79:c0
+        pci: '0000:43:11.3'
+        source_name: 5
+        vlan: 105
+      - mac: b2:80:62:dd:09:ea
+        pci: '0000:43:11.5'
+        source_name: 6
+        vlan: 106
+      - mac: ea:41:30:8e:af:b9
+        pci: '0000:43:11.7'
+        source_name: 7
+        vlan: 107
+      mac: a0:36:9f:25:97:de
+    - source_name: p3p1
+      Mbps: 10000
+      pci: '0000:43:00.0'
+      switch_port: port1/2
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 66:80:a0:55:83:93
+        pci: '0000:43:10.0'
+        source_name: 0
+        vlan: 102
+      - mac: fe:fd:72:b8:fe:bb
+        pci: '0000:43:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: 6a:70:92:7f:6b:7b
+        pci: '0000:43:10.4'
+        source_name: 2
+        vlan: 100
+      - mac: 3a:14:75:5e:63:15
+        pci: '0000:43:10.6'
+        source_name: 3
+        vlan: 101
+      - mac: 2e:c9:5d:6e:27:48
+        pci: '0000:43:11.0'
+        source_name: 4
+        vlan: 104
+      - mac: 02:f7:bb:82:78:1f
+        pci: '0000:43:11.2'
+        source_name: 5
+        vlan: 105
+      - mac: 0e:5e:b6:a8:6c:80
+        pci: '0000:43:11.4'
+        source_name: 6
+        vlan: 107
+      - mac: 8e:bf:81:bc:cb:44
+        pci: '0000:43:11.6'
+        source_name: 7
+        vlan: 106
+      mac: a0:36:9f:25:97:dc
+    numa_socket: 1
+    hugepages: 28
+    memory: 32
+  - cores:
+    - core_id: 0
+      thread_id: 0
+      status: noteligible
+    - core_id: 0
+      thread_id: 24
+      status: noteligible
+    - core_id: 1
+      thread_id: 2
+    - core_id: 1
+      thread_id: 26
+    - core_id: 2
+      thread_id: 4
+    - core_id: 2
+      thread_id: 28
+    - core_id: 3
+      thread_id: 6
+    - core_id: 3
+      thread_id: 30
+    - core_id: 4
+      thread_id: 8
+    - core_id: 4
+      thread_id: 32
+    - core_id: 5
+      thread_id: 10
+    - core_id: 5
+      thread_id: 34
+    - core_id: 6
+      thread_id: 12
+    - core_id: 6
+      thread_id: 36
+    - core_id: 7
+      thread_id: 14
+    - core_id: 7
+      thread_id: 38
+    - core_id: 8
+      thread_id: 16
+    - core_id: 8
+      thread_id: 40
+    - core_id: 9
+      thread_id: 18
+    - core_id: 9
+      thread_id: 42
+    - core_id: 10
+      thread_id: 20
+    - core_id: 10
+      thread_id: 44
+    - core_id: 11
+      thread_id: 22
+    - core_id: 11
+      thread_id: 46
+    interfaces:
+    - source_name: p5p1
+      Mbps: 10000
+      pci: '0000:04:00.0'
+      switch_port: port1/4
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: aa:ef:2c:23:ae:04
+        pci: '0000:04:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: 2e:d5:b9:3e:c4:8b
+        pci: '0000:04:10.2'
+        source_name: 1
+        vlan: 105
+      - mac: 4e:d6:55:09:17:1e
+        pci: '0000:04:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: ce:42:cc:9c:5a:32
+        pci: '0000:04:10.6'
+        source_name: 3
+        vlan: 107
+      - mac: 1e:71:34:7f:5d:47
+        pci: '0000:04:11.0'
+        source_name: 4
+        vlan: 102
+      - mac: 26:5c:e4:db:8c:48
+        pci: '0000:04:11.2'
+        source_name: 5
+        vlan: 103
+      - mac: 5e:48:23:56:63:c0
+        pci: '0000:04:11.4'
+        source_name: 6
+        vlan: 100
+      - mac: 9a:a2:fa:97:19:84
+        pci: '0000:04:11.6'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:27:46:a0
+    - source_name: p5p2
+      Mbps: 10000
+      pci: '0000:04:00.1'
+      switch_port: port1/5
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 0a:9b:b5:d1:e6:34
+        pci: '0000:04:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: 5e:87:4a:22:e9:57
+        pci: '0000:04:10.3'
+        source_name: 1
+        vlan: 105
+      - mac: ea:94:d5:f6:ee:bb
+        pci: '0000:04:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: 5a:3f:17:6b:bb:8b
+        pci: '0000:04:10.7'
+        source_name: 3
+        vlan: 107
+      - mac: 8e:af:5c:cc:c8:82
+        pci: '0000:04:11.1'
+        source_name: 4
+        vlan: 102
+      - mac: 3e:a0:df:f0:2b:07
+        pci: '0000:04:11.3'
+        source_name: 5
+        vlan: 103
+      - mac: ae:7d:00:9b:54:4d
+        pci: '0000:04:11.5'
+        source_name: 6
+        vlan: 100
+      - mac: fa:b5:0d:c6:78:87
+        pci: '0000:04:11.7'
+        source_name: 7
+        vlan: 101
+      mac: a0:36:9f:27:46:a2
+    - source_name: p7p1
+      Mbps: 10000
+      pci: '0000:06:00.0'
+      switch_port: port1/6
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 22:4a:21:37:84:80
+        pci: '0000:06:10.0'
+        source_name: 0
+        vlan: 104
+      - mac: b2:8f:2c:04:08:08
+        pci: '0000:06:10.2'
+        source_name: 1
+        vlan: 103
+      - mac: fe:2e:71:1f:99:dd
+        pci: '0000:06:10.4'
+        source_name: 2
+        vlan: 106
+      - mac: 1a:2c:7c:98:39:b6
+        pci: '0000:06:10.6'
+        source_name: 3
+        vlan: 105
+      - mac: 6e:39:08:a9:7e:b1
+        pci: '0000:06:11.0'
+        source_name: 4
+        vlan: 107
+      - mac: 4a:00:f3:5b:15:27
+        pci: '0000:06:11.2'
+        source_name: 5
+        vlan: 102
+      - mac: b2:c3:48:da:24:55
+        pci: '0000:06:11.4'
+        source_name: 6
+        vlan: 101
+      - mac: 72:85:cd:18:ee:5d
+        pci: '0000:06:11.6'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:27:45:80
+    - source_name: p7p2
+      Mbps: 10000
+      pci: '0000:06:00.1'
+      switch_port: port1/7
+      switch_dpid: '00:01:02:03:04:05:06:07'
+      sriovs:
+      - mac: 0a:60:1a:9d:ba:e2
+        pci: '0000:06:10.1'
+        source_name: 0
+        vlan: 104
+      - mac: 72:cb:0a:99:2f:7e
+        pci: '0000:06:10.3'
+        source_name: 1
+        vlan: 103
+      - mac: f2:2b:6b:d8:95:aa
+        pci: '0000:06:10.5'
+        source_name: 2
+        vlan: 106
+      - mac: b2:3a:4a:a8:c9:e9
+        pci: '0000:06:10.7'
+        source_name: 3
+        vlan: 105
+      - mac: 06:85:75:b1:e8:10
+        pci: '0000:06:11.1'
+        source_name: 4
+        vlan: 107
+      - mac: 12:41:69:61:89:3a
+        pci: '0000:06:11.3'
+        source_name: 5
+        vlan: 102
+      - mac: 86:03:a8:5a:ad:71
+        pci: '0000:06:11.5'
+        source_name: 6
+        vlan: 101
+      - mac: ca:9c:5c:ad:e2:e2
+        pci: '0000:06:11.7'
+        source_name: 7
+        vlan: 100
+      mac: a0:36:9f:27:45:82
+    numa_socket: 0
+    hugepages: 28
+    memory: 32
+
index affe668..6a2bdae 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index a599884..56c3a4e 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index cfae0c7..3636946 100644 (file)
@@ -1,3 +1,24 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
 network:
     name:               default
     type:               bridge_man
index cbc7980..5f93a67 100644 (file)
@@ -1,3 +1,24 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
 network:
     name:               macvtap:em1
     type:               bridge_man
index f913670..ed56028 100644 (file)
@@ -1,3 +1,24 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
 network:
     name:               shared_bridge_net
     type:               bridge_data
index ed3b940..43e5939 100644 (file)
@@ -1,3 +1,24 @@
+##
+# Copyright 2016 Telefónica Investigación y Desarrollo, S.A.U.
+# This file is part of openvim
+# 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
+##
+
 network:
     name:               data_net
     type:               data
index af1e673..73fa085 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 6a07a3a..c84e8bd 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 6f30d14..90d72ce 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 82ac36a..58832f3 100644 (file)
@@ -1,6 +1,6 @@
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 88fdc70..3f76771 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 73fcc23..b209a57 100755 (executable)
@@ -4,7 +4,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 58441e5..7ba27d0 100755 (executable)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index 002d994..d88306d 100644 (file)
--- a/vim_db.py
+++ b/vim_db.py
@@ -3,7 +3,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
index f0aecb7..1a75dde 100644 (file)
@@ -2,7 +2,7 @@
 
 ##
 # Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
+# This file is part of openvim
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may