From a0b4d15dc6bcd4e7f547e0b8812dc8f6544dc12c Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 29 Nov 2021 10:27:06 +0100 Subject: [PATCH] Remove deprecation warnings (#676) Change-Id: I354d1a62c77aa1fa38f4be4615f264bc08f7795b --- zaza/openstack/charm_tests/neutron/setup.py | 3 ++- zaza/openstack/configure/network.py | 3 ++- zaza/openstack/utilities/openstack_upgrade.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/neutron/setup.py b/zaza/openstack/charm_tests/neutron/setup.py index 174c51d..290483a 100644 --- a/zaza/openstack/charm_tests/neutron/setup.py +++ b/zaza/openstack/charm_tests/neutron/setup.py @@ -23,10 +23,11 @@ from zaza.openstack.configure import ( from zaza.openstack.utilities import ( cli as cli_utils, generic as generic_utils, - juju as juju_utils, openstack as openstack_utils, ) +import zaza.utilities.juju as juju_utils + import zaza.charm_lifecycle.utils as lifecycle_utils diff --git a/zaza/openstack/configure/network.py b/zaza/openstack/configure/network.py index 5d3a2f8..c0bbe1c 100755 --- a/zaza/openstack/configure/network.py +++ b/zaza/openstack/configure/network.py @@ -85,10 +85,11 @@ import sys from zaza.openstack.utilities import ( cli as cli_utils, generic as generic_utils, - juju as juju_utils, openstack as openstack_utils, ) +import zaza.utilities.juju as juju_utils + def setup_sdn(network_config, keystone_session=None): """Perform setup for Software Defined Network. diff --git a/zaza/openstack/utilities/openstack_upgrade.py b/zaza/openstack/utilities/openstack_upgrade.py index f75a05c..0451b8f 100755 --- a/zaza/openstack/utilities/openstack_upgrade.py +++ b/zaza/openstack/utilities/openstack_upgrade.py @@ -17,7 +17,7 @@ This module contains a number of functions for upgrading OpenStack. """ import logging -import zaza.openstack.utilities.juju as juju_utils +import zaza.utilities.juju as juju_utils import zaza.model from zaza import sync_wrapper