Enable N302: Import modules only

Fix all N302 issues, and re-enable.

Change-Id: Ic94d144c915b228b7ff2fd9c5951875e159ffcdd

contrib/boto_v6/ec2/instance.py

@@ -3,29 +3,29 @@
 
 @author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
 '''
-import boto.ec2.instance
-from boto.resultset import ResultSet
+from boto.ec2 import instance
+from boto import resultset
 
 
-class ReservationV6(boto.ec2.instance.Reservation):
+class ReservationV6(instance.Reservation):
     def startElement(self, name, attrs, connection):
         if name == 'instancesSet':
-            self.instances = ResultSet([('item', InstanceV6)])
+            self.instances = resultset.ResultSet([('item', InstanceV6)])
             return self.instances
         elif name == 'groupSet':
-            self.groups = ResultSet([('item', boto.ec2.instance.Group)])
+            self.groups = resultset.ResultSet([('item', instance.Group)])
             return self.groups
         else:
             return None
 
 
-class InstanceV6(boto.ec2.instance.Instance):
+class InstanceV6(instance.Instance):
     def __init__(self, connection=None):
-        boto.ec2.instance.Instance.__init__(self, connection)
+        instance.Instance.__init__(self, connection)
         self.dns_name_v6 = None
 
     def endElement(self, name, value, connection):
-        boto.ec2.instance.Instance.endElement(self, name, value, connection)
+        instance.Instance.endElement(self, name, value, connection)
         if name == 'dnsNameV6':
             self.dns_name_v6 = value
 

nova/api/openstack/compute/contrib/coverage_ext.py

@@ -23,7 +23,7 @@
 import telnetlib
 import tempfile
 
-from coverage import coverage
+import coverage
 from webob import exc
 
 from nova.api.openstack import extensions
@@ -47,7 +47,7 @@ class CoverageController(object):
     def __init__(self):
         self.data_path = tempfile.mkdtemp(prefix='nova-coverage_')
         data_out = os.path.join(self.data_path, '.nova-coverage')
-        self.coverInst = coverage(data_file=data_out)
+        self.coverInst = coverage.coverage(data_file=data_out)
         self.compute_api = compute_api.API()
         self.network_api = network_api.API()
         self.conductor_api = conductor_api.API()

nova/db/sqlalchemy/api.py

@@ -35,7 +35,7 @@
 from sqlalchemy.sql import func
 
 from nova import block_device
-from nova.common.sqlalchemyutils import paginate_query
+from nova.common import sqlalchemyutils
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import db
@@ -1645,7 +1645,8 @@ def instance_get_all_by_filters(context, filters, sort_key, sort_dir,
             marker = _instance_get_by_uuid(context, marker, session=session)
         except exception.InstanceNotFound:
             raise exception.MarkerNotFound(marker)
-    query_prefix = paginate_query(query_prefix, models.Instance, limit,
+    query_prefix = sqlalchemyutils.paginate_query(query_prefix,
+                           models.Instance, limit,
                            [sort_key, 'created_at', 'id'],
                            marker=marker,
                            sort_dir=sort_dir)

nova/db/sqlalchemy/models.py

@@ -27,7 +27,7 @@
 from sqlalchemy.orm import relationship, backref, object_mapper
 
 from nova.db.sqlalchemy.session import get_session
-from nova.db.sqlalchemy.types import IPAddress
+from nova.db.sqlalchemy import types
 from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
 
@@ -291,8 +291,8 @@ def _extra_keys(self):
 
     # User editable field meant to represent what ip should be used
     # to connect to the instance
-    access_ip_v4 = Column(IPAddress())
-    access_ip_v6 = Column(IPAddress())
+    access_ip_v4 = Column(types.IPAddress())
+    access_ip_v6 = Column(types.IPAddress())
 
     auto_disk_config = Column(Boolean())
     progress = Column(Integer)
@@ -595,7 +595,7 @@ class SecurityGroupIngressRule(BASE, NovaBase):
     protocol = Column(String(5))  # "tcp", "udp", or "icmp"
     from_port = Column(Integer)
     to_port = Column(Integer)
-    cidr = Column(IPAddress())
+    cidr = Column(types.IPAddress())
 
     # Note: This is not the parent SecurityGroup. It's SecurityGroup we're
     # granting access for.
@@ -615,7 +615,7 @@ class ProviderFirewallRule(BASE, NovaBase):
     protocol = Column(String(5))  # "tcp", "udp", or "icmp"
     from_port = Column(Integer)
     to_port = Column(Integer)
-    cidr = Column(IPAddress())
+    cidr = Column(types.IPAddress())
 
 
 class KeyPair(BASE, NovaBase):
@@ -665,25 +665,25 @@ class Network(BASE, NovaBase):
     label = Column(String(255))
 
     injected = Column(Boolean, default=False)
-    cidr = Column(IPAddress(), unique=True)
-    cidr_v6 = Column(IPAddress(), unique=True)
+    cidr = Column(types.IPAddress(), unique=True)
+    cidr_v6 = Column(types.IPAddress(), unique=True)
     multi_host = Column(Boolean, default=False)
 
-    gateway_v6 = Column(IPAddress())
-    netmask_v6 = Column(IPAddress())
-    netmask = Column(IPAddress())
+    gateway_v6 = Column(types.IPAddress())
+    netmask_v6 = Column(types.IPAddress())
+    netmask = Column(types.IPAddress())
     bridge = Column(String(255))
     bridge_interface = Column(String(255))
-    gateway = Column(IPAddress())
-    broadcast = Column(IPAddress())
-    dns1 = Column(IPAddress())
-    dns2 = Column(IPAddress())
+    gateway = Column(types.IPAddress())
+    broadcast = Column(types.IPAddress())
+    dns1 = Column(types.IPAddress())
+    dns2 = Column(types.IPAddress())
 
     vlan = Column(Integer)
-    vpn_public_address = Column(IPAddress())
+    vpn_public_address = Column(types.IPAddress())
     vpn_public_port = Column(Integer)
-    vpn_private_address = Column(IPAddress())
-    dhcp_start = Column(IPAddress())
+    vpn_private_address = Column(types.IPAddress())
+    dhcp_start = Column(types.IPAddress())
 
     rxtx_base = Column(Integer)
 
@@ -708,7 +708,7 @@ class FixedIp(BASE, NovaBase):
     """Represents a fixed ip for an instance."""
     __tablename__ = 'fixed_ips'
     id = Column(Integer, primary_key=True)
-    address = Column(IPAddress())
+    address = Column(types.IPAddress())
     network_id = Column(Integer, nullable=True)
     virtual_interface_id = Column(Integer, nullable=True)
     instance_uuid = Column(String(36), nullable=True)
@@ -725,7 +725,7 @@ class FloatingIp(BASE, NovaBase):
     """Represents a floating ip that dynamically forwards to a fixed ip."""
     __tablename__ = 'floating_ips'
     id = Column(Integer, primary_key=True)
-    address = Column(IPAddress())
+    address = Column(types.IPAddress())
     fixed_ip_id = Column(Integer, nullable=True)
     project_id = Column(String(255))
     host = Column(String(255))  # , ForeignKey('hosts.id'))
@@ -748,7 +748,7 @@ class ConsolePool(BASE, NovaBase):
     """Represents pool of consoles on the same physical node."""
     __tablename__ = 'console_pools'
     id = Column(Integer, primary_key=True)
-    address = Column(IPAddress())
+    address = Column(types.IPAddress())
     username = Column(String(255))
     password = Column(String(255))
     console_type = Column(String(255))

nova/servicegroup/__init__.py

@@ -19,4 +19,6 @@
 according to the Nova configuration.
 """
 
-from nova.servicegroup.api import API
+from nova.servicegroup import api
+
+API = api.API

nova/tests/api/openstack/compute/contrib/test_coverage_ext.py

@@ -16,7 +16,7 @@
 
 import telnetlib
 
-from coverage import coverage
+import coverage
 import webob
 
 from nova.api.openstack.compute.contrib import coverage_ext
@@ -48,8 +48,8 @@ def setUp(self):
         super(CoverageExtensionTest, self).setUp()
         self.stubs.Set(telnetlib.Telnet, 'write', fake_telnet)
         self.stubs.Set(telnetlib.Telnet, 'expect', fake_telnet)
-        self.stubs.Set(coverage, 'report', fake_report)
-        self.stubs.Set(coverage, 'xml_report', fake_xml_report)
+        self.stubs.Set(coverage.coverage, 'report', fake_report)
+        self.stubs.Set(coverage.coverage, 'xml_report', fake_xml_report)
         self.admin_context = context.RequestContext('fakeadmin_0',
                                                     'fake',
                                                      is_admin=True)

nova/tests/baremetal/test_pxe.py

@@ -22,10 +22,7 @@
 import os
 
 import mox
-from testtools.matchers import Contains
-from testtools.matchers import MatchesAll
-from testtools.matchers import Not
-from testtools.matchers import StartsWith
+from testtools import matchers
 
 from nova import exception
 from nova.openstack.common import cfg
@@ -120,26 +117,26 @@ def test_build_pxe_config(self):
                 'ari_path': 'ggg',
             }
         config = pxe.build_pxe_config(**args)
-        self.assertThat(config, StartsWith('default deploy'))
+        self.assertThat(config, matchers.StartsWith('default deploy'))
 
         # deploy bits are in the deploy section
         start = config.index('label deploy')
         end = config.index('label boot')
-        self.assertThat(config[start:end], MatchesAll(
-            Contains('kernel ddd'),
-            Contains('initrd=eee'),
-            Contains('deployment_id=aaa'),
-            Contains('deployment_key=bbb'),
-            Contains('iscsi_target_iqn=ccc'),
-            Not(Contains('kernel fff')),
+        self.assertThat(config[start:end], matchers.MatchesAll(
+            matchers.Contains('kernel ddd'),
+            matchers.Contains('initrd=eee'),
+            matchers.Contains('deployment_id=aaa'),
+            matchers.Contains('deployment_key=bbb'),
+            matchers.Contains('iscsi_target_iqn=ccc'),
+            matchers.Not(matchers.Contains('kernel fff')),
             ))
 
         # boot bits are in the boot section
         start = config.index('label boot')
-        self.assertThat(config[start:], MatchesAll(
-            Contains('kernel fff'),
-            Contains('initrd=ggg'),
-            Not(Contains('kernel ddd')),
+        self.assertThat(config[start:], matchers.MatchesAll(
+            matchers.Contains('kernel fff'),
+            matchers.Contains('initrd=ggg'),
+            matchers.Not(matchers.Contains('kernel ddd')),
             ))
 
     def test_build_network_config(self):

nova/tests/compute/test_compute.py

@@ -58,7 +58,7 @@
 from nova import quota
 from nova import test
 from nova.tests.compute import fake_resource_tracker
-from nova.tests.db.fakes import FakeModel
+from nova.tests.db import fakes as db_fakes
 from nova.tests import fake_network
 from nova.tests.image import fake as fake_image
 from nova.tests import matchers
@@ -5879,11 +5879,11 @@ def test_secgroup_refresh(self):
         instance = self._create_fake_instance()
 
         def rule_get(*args, **kwargs):
-            mock_rule = FakeModel({'parent_group_id': 1})
+            mock_rule = db_fakes.FakeModel({'parent_group_id': 1})
             return [mock_rule]
 
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': [instance]})
+            mock_group = db_fakes.FakeModel({'instances': [instance]})
             return mock_group
 
         self.stubs.Set(
@@ -5908,11 +5908,11 @@ def test_secgroup_refresh_once(self):
         instance = self._create_fake_instance()
 
         def rule_get(*args, **kwargs):
-            mock_rule = FakeModel({'parent_group_id': 1})
+            mock_rule = db_fakes.FakeModel({'parent_group_id': 1})
             return [mock_rule]
 
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': [instance]})
+            mock_group = db_fakes.FakeModel({'instances': [instance]})
             return mock_group
 
         self.stubs.Set(
@@ -5935,11 +5935,11 @@ def group_get(*args, **kwargs):
 
     def test_secgroup_refresh_none(self):
         def rule_get(*args, **kwargs):
-            mock_rule = FakeModel({'parent_group_id': 1})
+            mock_rule = db_fakes.FakeModel({'parent_group_id': 1})
             return [mock_rule]
 
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': []})
+            mock_group = db_fakes.FakeModel({'instances': []})
             return mock_group
 
         self.stubs.Set(
@@ -5957,7 +5957,7 @@ def test_secrule_refresh(self):
         instance = self._create_fake_instance()
 
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': [instance]})
+            mock_group = db_fakes.FakeModel({'instances': [instance]})
             return mock_group
 
         self.stubs.Set(self.compute_api.db, 'security_group_get', group_get)
@@ -5978,7 +5978,7 @@ def test_secrule_refresh_once(self):
         instance = self._create_fake_instance()
 
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': [instance]})
+            mock_group = db_fakes.FakeModel({'instances': [instance]})
             return mock_group
 
         self.stubs.Set(self.compute_api.db, 'security_group_get', group_get)
@@ -5997,7 +5997,7 @@ def group_get(*args, **kwargs):
 
     def test_secrule_refresh_none(self):
         def group_get(*args, **kwargs):
-            mock_group = FakeModel({'instances': []})
+            mock_group = db_fakes.FakeModel({'instances': []})
             return mock_group
 
         self.stubs.Set(self.compute_api.db, 'security_group_get', group_get)

nova/tests/integrated/test_api_samples.py

@@ -22,13 +22,13 @@
 import urllib
 import uuid as uuid_lib
 
-from coverage import coverage
+import coverage
 from lxml import etree
 
 from nova.api.metadata import password
 from nova.api.openstack.compute.contrib import coverage_ext
 # Import extensions to pull in osapi_compute_extension CONF option used below.
-from nova.cloudpipe.pipelib import CloudPipe
+from nova.cloudpipe import pipelib
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
@@ -761,7 +761,7 @@ def _fake_xml_report(self, outfile=None):
 
         self.stubs.Set(coverage_ext.CoverageController, '_check_coverage',
                        _fake_check_coverage)
-        self.stubs.Set(coverage, 'xml_report', _fake_xml_report)
+        self.stubs.Set(coverage.coverage, 'xml_report', _fake_xml_report)
 
     def test_start_coverage(self):
         # Start coverage data collection.
@@ -1512,7 +1512,7 @@ def network_api_get(self, context, network_uuid):
             return {'vpn_public_address': '127.0.0.1',
                     'vpn_public_port': 22}
 
-        self.stubs.Set(CloudPipe, 'get_encoded_zip', get_user_data)
+        self.stubs.Set(pipelib.CloudPipe, 'get_encoded_zip', get_user_data)
         self.stubs.Set(network_manager.NetworkManager, "get_network",
                        network_api_get)
 

nova/tests/scheduler/test_host_filters.py

@@ -25,7 +25,7 @@
 from nova.openstack.common import timeutils
 from nova.scheduler import filters
 from nova.scheduler.filters import extra_specs_ops
-from nova.scheduler.filters.trusted_filter import AttestationService
+from nova.scheduler.filters import trusted_filter
 from nova import servicegroup
 from nova import test
 from nova.tests.scheduler import fakes
@@ -242,7 +242,8 @@ def setUp(self):
         self.oat_data = ''
         self.oat_attested = False
         self.stubs = stubout.StubOutForTesting()
-        self.stubs.Set(AttestationService, '_request', self.fake_oat_request)
+        self.stubs.Set(trusted_filter.AttestationService, '_request',
+                self.fake_oat_request)
         self.context = context.RequestContext('fake', 'fake')
         self.json_query = jsonutils.dumps(
                 ['and', ['>=', '$free_ram_mb', 1024],