From 3265df3f6c84fe88bb358f088e218628094646ff Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 3 Mar 2021 16:07:14 +0100 Subject: [PATCH] cleanup imports --- .../integration/component/test_configdrive.py | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/test/integration/component/test_configdrive.py b/test/integration/component/test_configdrive.py index d68c5e63ff8..316fbe98c98 100644 --- a/test/integration/component/test_configdrive.py +++ b/test/integration/component/test_configdrive.py @@ -19,44 +19,46 @@ and password reset functionality with ConfigDrive """ + +# Import Local Modules +from marvin.cloudstackAPI import (restartVPC) +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.lib.base import ( + Account, + createVlanIpRange, + Configurations, + FireWallRule, + Host, + listVlanIpRanges, + Network, + NetworkACL, + NetworkACLList, + NetworkOffering, + NetworkServiceProvider, + PublicIPAddress, + Router, + ServiceOffering, + createSSHKeyPair, + deleteSSHKeyPair, + StaticNATRule, + VirtualMachine, + VPC, + VpcOffering, + Hypervisor, Template) +from marvin.lib.common import ( + get_domain, + get_zone, get_test_template, + is_config_suitable) +from marvin.lib.utils import random_gen + +# Import System Modules import base64 import os import socket -# Import Local Modules import subprocess import tempfile -from contextlib import contextmanager - import time -from marvin.cloudstackAPI import (restartVPC) -from marvin.cloudstackTestCase import cloudstackTestCase -from marvin.lib.base import (Account, - createVlanIpRange, - Configurations, - FireWallRule, - Host, - listVlanIpRanges, - Network, - NetworkACL, - NetworkACLList, - NetworkOffering, - NetworkServiceProvider, - PublicIPAddress, - Router, - ServiceOffering, - createSSHKeyPair, - deleteSSHKeyPair, - StaticNATRule, - VirtualMachine, - VPC, - VpcOffering, - Hypervisor, Template) -from marvin.lib.common import (get_domain, - get_template, - get_zone, get_test_template, - is_config_suitable) -from marvin.lib.utils import random_gen -# Import System Modules +from contextlib import contextmanager from nose.plugins.attrib import attr from retry import retry @@ -2371,7 +2373,6 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils): vm1, public_ip_1, metadata=True) - # ===================================================================== # Network restart tests # =====================================================================