From: Daniel Henrique Barboza <dhbarboza82@gmail.com> This patch migrates Kimchi to use the new netinfo module from Gingerbase. No API changes were done at this time. Signed-off-by: Daniel Henrique Barboza <dhbarboza82@gmail.com> --- model/interfaces.py | 2 +- model/networks.py | 6 +++--- tests/test_model.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/model/interfaces.py b/model/interfaces.py index 01fbb93..2d74fd4 100644 --- a/model/interfaces.py +++ b/model/interfaces.py @@ -19,7 +19,7 @@ from wok.exception import NotFoundError -from wok.plugins.kimchi import netinfo +from wok.plugins.gingerbase import netinfo from wok.plugins.kimchi.model.networks import NetworksModel diff --git a/model/networks.py b/model/networks.py index 08b2690..9ae2ea8 100644 --- a/model/networks.py +++ b/model/networks.py @@ -30,12 +30,12 @@ from wok.exception import MissingParameter, NotFoundError, OperationFailed from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text -from wok.plugins.kimchi import netinfo +from wok.plugins.gingerbase import netinfo +from wok.plugins.gingerbase.netinfo import get_vlan_device, is_bridge, is_vlan +from wok.plugins.gingerbase.netinfo import ports from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.config import kimchiPaths from wok.plugins.kimchi.model.config import CapabilitiesModel -from wok.plugins.kimchi.netinfo import get_vlan_device, is_bridge, is_vlan -from wok.plugins.kimchi.netinfo import ports from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml diff --git a/tests/test_model.py b/tests/test_model.py index 4af3b2c..c89c269 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -37,7 +37,7 @@ from wok.rollbackcontext import RollbackContext from wok.utils import add_task, get_task_id from wok.xmlutils.utils import xpath_get_text -from wok.plugins.kimchi import netinfo +from wok.plugins.gingerbase import netinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.config import kimchiPaths as paths from wok.plugins.kimchi.model import model -- 2.5.5