openstack
/
heat
Code Issues Proposed changes

Order imports in alphabetical order (7/9) 

This patch is one in a series to re-enable H306 style check rule
(imports are in alphabetical order). It touches roughly half of tests
(up to and including test_m*).

Implements: blueprint reduce-flake8-ignored-rules (partial)
Change-Id: Id1e10f7a519ceeb4339488760b36950440461edb
This commit is contained in:
Pavlo Shchelokovskyy 2014-02-06 14:15:28 +02:00
parent 6a7fd79ae1
commit f7338aa008
33 changed files with 148 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
heat/tests/common.py
View File

@ -12,22 +12,21 @@
# under the License. # under the License.
import fixtures
import logging import logging
import mox
import os import os
import sys import sys
import time import time
import fixtures
import mox
from oslo.config import cfg
import testscenarios import testscenarios
import testtools import testtools
from oslo.config import cfg
from heat.openstack.common.fixture import mockpatch
from heat.engine import environment from heat.engine import environment
from heat.engine import resources from heat.engine import resources
from heat.engine import scheduler from heat.engine import scheduler
from heat.openstack.common.fixture import mockpatch
class HeatTestCase(testscenarios.WithScenarios, testtools.TestCase): class HeatTestCase(testscenarios.WithScenarios, testtools.TestCase):

6
heat/tests/db/test_migrations.py
View File

@ -20,21 +20,21 @@ properly both upgrading and downgrading, and that no data loss occurs
if possible. if possible.
""" """
import datetime
import os import os
import shutil import shutil
import sqlalchemy
import subprocess import subprocess
import tempfile import tempfile
import uuid import uuid
import datetime
from migrate.versioning import repository from migrate.versioning import repository
import sqlalchemy
from heat.db.sqlalchemy import migrate_repo from heat.db.sqlalchemy import migrate_repo
from heat.db.sqlalchemy import migration from heat.db.sqlalchemy import migration
from heat.openstack.common.db.sqlalchemy import test_migrations
from heat.openstack.common import log as logging from heat.openstack.common import log as logging
from heat.openstack.common.py3kcompat import urlutils from heat.openstack.common.py3kcompat import urlutils
from heat.openstack.common.db.sqlalchemy import test_migrations
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
heat/tests/generic_resource.py
View File

@ -14,9 +14,8 @@
from heat.engine import resource from heat.engine import resource
from heat.engine import signal_responder from heat.engine import signal_responder
from heat.engine import stack_user from heat.engine import stack_user
from heat.openstack.common import log as logging
from heat.openstack.common.gettextutils import _ from heat.openstack.common.gettextutils import _
from heat.openstack.common import log as logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
heat/tests/test_api_aws.py
View File

@ -12,8 +12,8 @@
# under the License. # under the License.
from heat.tests.common import HeatTestCase
from heat.api.aws import utils as api_utils from heat.api.aws import utils as api_utils
from heat.tests.common import HeatTestCase
class AWSCommonTest(HeatTestCase): class AWSCommonTest(HeatTestCase):

8
heat/tests/test_api_cfn_v1.py
View File

@ -12,19 +12,19 @@
# under the License. # under the License.
import json import json
import mock
import os import os
import mock
from oslo.config import cfg from oslo.config import cfg
from heat.api.aws import exception
import heat.api.cfn.v1.stacks as stacks
from heat.common import exception as heat_exception from heat.common import exception as heat_exception
from heat.common import identifier from heat.common import identifier
from heat.common import policy from heat.common import policy
from heat.openstack.common import rpc
from heat.common.wsgi import Request from heat.common.wsgi import Request
from heat.openstack.common import rpc
from heat.rpc import api as rpc_api from heat.rpc import api as rpc_api
from heat.api.aws import exception
import heat.api.cfn.v1.stacks as stacks
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils

6
heat/tests/test_api_cloudwatch.py
View File

@ -15,11 +15,11 @@ import os
from oslo.config import cfg from oslo.config import cfg
from heat.common import policy
from heat.openstack.common import rpc
from heat.common.wsgi import Request
from heat.api.aws import exception from heat.api.aws import exception
import heat.api.cloudwatch.watch as watches import heat.api.cloudwatch.watch as watches
from heat.common import policy
from heat.common.wsgi import Request
from heat.openstack.common import rpc
from heat.rpc import api as engine_api from heat.rpc import api as engine_api
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils

11
heat/tests/test_api_ec2token.py
View File

@ -12,17 +12,16 @@
# under the License. # under the License.
from heat.tests.common import HeatTestCase
import requests
import json import json
from oslo.config import cfg
from oslo.config import cfg
import requests
from heat.api.aws import ec2token
from heat.api.aws import exception from heat.api.aws import exception
from heat.common.wsgi import Request from heat.common.wsgi import Request
from heat.api.aws import ec2token
from heat.openstack.common import importutils from heat.openstack.common import importutils
from heat.tests.common import HeatTestCase
class Ec2TokenTest(HeatTestCase): class Ec2TokenTest(HeatTestCase):

29
heat/tests/test_api_openstack_v1.py
View File

@ -12,35 +12,32 @@
# under the License. # under the License.
import json import json
import mock
import mock
from oslo.config import cfg from oslo.config import cfg
import webob.exc import webob.exc
from heat.common import identifier import heat.api.middleware.fault as fault
from heat.openstack.common import rpc import heat.api.openstack.v1 as api_v1
import heat.api.openstack.v1.actions as actions
import heat.api.openstack.v1.build_info as build_info
import heat.api.openstack.v1.events as events
import heat.api.openstack.v1.resources as resources
import heat.api.openstack.v1.software_configs as software_configs
import heat.api.openstack.v1.software_deployments as software_deployments
import heat.api.openstack.v1.stacks as stacks
from heat.common import exception as heat_exc from heat.common import exception as heat_exc
from heat.common import identifier
from heat.common import policy from heat.common import policy
from heat.common.wsgi import Request
from heat.common import urlfetch from heat.common import urlfetch
from heat.common.wsgi import Request
from heat.openstack.common import rpc
from heat.openstack.common.rpc import common as rpc_common from heat.openstack.common.rpc import common as rpc_common
from heat.rpc import api as rpc_api from heat.rpc import api as rpc_api
from heat.rpc import client as rpc_client from heat.rpc import client as rpc_client
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
import heat.api.openstack.v1 as api_v1
import heat.api.openstack.v1.stacks as stacks
import heat.api.openstack.v1.resources as resources
import heat.api.openstack.v1.events as events
import heat.api.openstack.v1.actions as actions
import heat.api.openstack.v1.build_info as build_info
import heat.api.openstack.v1.software_configs as software_configs
import heat.api.openstack.v1.software_deployments as software_deployments
from heat.tests import utils from heat.tests import utils
import heat.api.middleware.fault as fault
def request_with_middleware(middleware, func, req, *args, **kwargs): def request_with_middleware(middleware, func, req, *args, **kwargs):

2
heat/tests/test_api_openstack_v1_views_stacks_view_builder.py
View File

@ -13,9 +13,9 @@
import mock import mock
from heat.tests.common import HeatTestCase
from heat.api.openstack.v1.views import stacks_view from heat.api.openstack.v1.views import stacks_view
from heat.common import identifier from heat.common import identifier
from heat.tests.common import HeatTestCase
class TestFormatStack(HeatTestCase): class TestFormatStack(HeatTestCase):

2
heat/tests/test_api_openstack_v1_views_views_common.py
View File

@ -13,9 +13,9 @@
import mock import mock
from heat.tests.common import HeatTestCase
from heat.api.openstack.v1.views import views_common from heat.api.openstack.v1.views import views_common
from heat.openstack.common.py3kcompat import urlutils from heat.openstack.common.py3kcompat import urlutils
from heat.tests.common import HeatTestCase
class TestViewsCommon(HeatTestCase): class TestViewsCommon(HeatTestCase):

2
heat/tests/test_auth_password.py
View File

@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from keystoneclient.v2_0 import client as keystone_client
from keystoneclient.exceptions import Unauthorized from keystoneclient.exceptions import Unauthorized
from keystoneclient.v2_0 import client as keystone_client
import webob import webob
from heat.common.auth_password import KeystonePasswordAuthProtocol from heat.common.auth_password import KeystonePasswordAuthProtocol

20
heat/tests/test_autoscaling.py
View File

@ -11,31 +11,29 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import datetime
import copy import copy
import datetime
import mock import mock
import mox import mox
from oslo.config import cfg
from testtools import skipIf from testtools import skipIf
from oslo.config import cfg from heat.common import exception
from heat.common import short_id from heat.common import short_id
from heat.common import template_format from heat.common import template_format
from heat.common import exception
from heat.engine.resources import autoscaling as asc
from heat.engine.resources import loadbalancer
from heat.engine.resources import instance
from heat.engine.resources.neutron import loadbalancer as neutron_lb
from heat.engine.notification import autoscaling as notification from heat.engine.notification import autoscaling as notification
from heat.engine import parser from heat.engine import parser
from heat.engine import resource from heat.engine import resource
from heat.engine import scheduler
from heat.engine.resource import Metadata from heat.engine.resource import Metadata
from heat.engine.resources import autoscaling as asc
from heat.engine.resources import image from heat.engine.resources import image
from heat.openstack.common import timeutils from heat.engine.resources import instance
from heat.engine.resources import loadbalancer
from heat.engine.resources.neutron import loadbalancer as neutron_lb
from heat.engine import scheduler
from heat.openstack.common.importutils import try_import from heat.openstack.common.importutils import try_import
from heat.openstack.common import timeutils
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import fakes from heat.tests import fakes
from heat.tests import utils from heat.tests import utils

12
heat/tests/test_autoscaling_update_policy.py
View File

@ -11,26 +11,26 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mox
import json
import copy import copy
import json
import mox
from oslo.config import cfg from oslo.config import cfg
from testtools.matchers import MatchesRegex
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine.notification import stack as notification
from heat.engine import clients from heat.engine import clients
from heat.engine.notification import stack as notification
from heat.engine import parser from heat.engine import parser
from heat.engine import stack_user
from heat.engine.resources import instance from heat.engine.resources import instance
from heat.engine.resources import loadbalancer as lb from heat.engine.resources import loadbalancer as lb
from heat.engine.resources import wait_condition as wc from heat.engine.resources import wait_condition as wc
from heat.engine import stack_user
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils
from heat.tests import fakes from heat.tests import fakes
from heat.tests import utils
from heat.tests.v1_1 import fakes as fakes11 from heat.tests.v1_1 import fakes as fakes11
from testtools.matchers import MatchesRegex
asg_tmpl_without_updt_policy = ''' asg_tmpl_without_updt_policy = '''

22
heat/tests/test_ceilometer_alarm.py
View File

@ -11,31 +11,27 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import copy import copy
import json import json
import mox import mox
import testtools
from oslo.config import cfg from oslo.config import cfg
import testtools
from heat.tests import fakes
from heat.tests import generic_resource
from heat.tests.common import HeatTestCase
from heat.tests import utils
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.openstack.common.importutils import try_import
from heat.engine import clients from heat.engine import clients
from heat.engine import parser from heat.engine import parser
from heat.engine.properties import schemata
from heat.engine import resource from heat.engine import resource
from heat.engine.resources.ceilometer import alarm
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import stack_user from heat.engine import stack_user
from heat.engine.properties import schemata from heat.openstack.common.importutils import try_import
from heat.engine.resources.ceilometer import alarm from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import generic_resource
from heat.tests import utils
ceilometerclient = try_import('ceilometerclient.v2') ceilometerclient = try_import('ceilometerclient.v2')

4
heat/tests/test_cloudwatch.py
View File

@ -15,10 +15,10 @@ from mock import patch
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.tests import common
from heat.tests import utils
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import watchrule from heat.engine import watchrule
from heat.tests import common
from heat.tests import utils
AWS_CloudWatch_Alarm = ''' AWS_CloudWatch_Alarm = '''

2
heat/tests/test_common_policy.py
View File

@ -17,8 +17,8 @@ import os.path
from oslo.config import cfg from oslo.config import cfg
from heat.common import policy
from heat.common import exception from heat.common import exception
from heat.common import policy
from heat.openstack.common import policy as base_policy from heat.openstack.common import policy as base_policy
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils

4
heat/tests/test_cw_alarm.py
View File

@ -15,10 +15,10 @@
import copy import copy
from heat.common import template_format from heat.common import template_format
from heat.engine.resources import cloud_watch
from heat.engine import resource from heat.engine import resource
from heat.engine import watchrule from heat.engine.resources import cloud_watch
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import watchrule
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils

2
heat/tests/test_dbinstance.py
View File

@ -12,10 +12,10 @@
# under the License. # under the License.
from heat.common import template_format from heat.common import template_format
from heat.engine import parser
from heat.engine import resource from heat.engine import resource
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils
from heat.engine import parser
rds_template = ''' rds_template = '''

2
heat/tests/test_dependencies.py
View File

@ -14,8 +14,8 @@
import testtools import testtools
from heat.engine.dependencies import Dependencies
from heat.engine.dependencies import CircularDependencyException from heat.engine.dependencies import CircularDependencyException
from heat.engine.dependencies import Dependencies
class dependenciesTest(testtools.TestCase): class dependenciesTest(testtools.TestCase):

9
heat/tests/test_eip.py
View File

@ -12,20 +12,19 @@
# under the License. # under the License.
import mox import mox
from testtools import skipIf from testtools import skipIf
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine.resources import eip
from heat.engine import clients from heat.engine import clients
from heat.engine import resource
from heat.engine import scheduler
from heat.engine import parser from heat.engine import parser
from heat.engine import resource
from heat.engine.resources import eip
from heat.engine import scheduler
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests.v1_1 import fakes
from heat.tests import fakes as fakec from heat.tests import fakes as fakec
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes
eip_template = ''' eip_template = '''

18
heat/tests/test_engine_api_utils.py
View File

@ -11,19 +11,19 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
import mock
import uuid
from datetime import datetime from datetime import datetime
import json
import uuid
import heat.engine.api as api import mock
from heat.common import template_format
from heat.engine import parser
from heat.engine import parameters
from heat.engine import resource
from heat.engine.event import Event
from heat.common.identifier import EventIdentifier from heat.common.identifier import EventIdentifier
from heat.common import template_format
from heat.engine import api
from heat.engine.event import Event
from heat.engine import parameters
from heat.engine import parser
from heat.engine import resource
from heat.rpc import api as rpc_api from heat.rpc import api as rpc_api
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import generic_resource as generic_rsrc from heat.tests import generic_resource as generic_rsrc

32
heat/tests/test_engine_service.py
View File

@ -13,47 +13,43 @@
import functools import functools
from eventlet import greenpool
import json import json
import sys import sys
import uuid import uuid
from eventlet import greenpool
import mock import mock
import mox import mox
from oslo.config import cfg from oslo.config import cfg
cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
from heat.common import exception from heat.common import exception
from heat.common import urlfetch
from heat.tests import fakes as test_fakes
from heat.tests.v1_1 import fakes
import heat.rpc.api as engine_api
import heat.db.api as db_api
from heat.common import identifier from heat.common import identifier
from heat.common import template_format from heat.common import template_format
from heat.common import urlfetch
import heat.db.api as db_api
from heat.engine import clients from heat.engine import clients
from heat.engine import dependencies from heat.engine import dependencies
from heat.engine import environment from heat.engine import environment
from heat.engine import parser from heat.engine import parser
from heat.engine.resource import _register_class
from heat.engine import service
from heat.engine.properties import Properties from heat.engine.properties import Properties
from heat.engine import resource as res from heat.engine import resource as res
from heat.engine.resources import instance as instances from heat.engine.resources import instance as instances
from heat.engine.resources import nova_utils from heat.engine.resources import nova_utils
from heat.engine import resource as rsrs from heat.engine import service
from heat.engine import stack_lock from heat.engine import stack_lock
from heat.engine import watchrule from heat.engine import watchrule
from heat.openstack.common.fixture import mockpatch from heat.openstack.common.fixture import mockpatch
from heat.openstack.common import threadgroup
from heat.openstack.common.rpc import common as rpc_common from heat.openstack.common.rpc import common as rpc_common
from heat.openstack.common.rpc import proxy from heat.openstack.common.rpc import proxy
from heat.openstack.common import threadgroup
import heat.rpc.api as engine_api
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import fakes as test_fakes
from heat.tests import generic_resource as generic_rsrc from heat.tests import generic_resource as generic_rsrc
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes
cfg.CONF.import_opt('engine_life_check_timeout', 'heat.common.config')
wp_template = ''' wp_template = '''
{ {
@ -1298,7 +1294,7 @@ class StackServiceAuthorizeTest(HeatTestCase):
self.eng = service.EngineService('a-host', 'a-topic') self.eng = service.EngineService('a-host', 'a-topic')
cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role')
_register_class('ResourceWithPropsType', res._register_class('ResourceWithPropsType',
generic_rsrc.ResourceWithProps) generic_rsrc.ResourceWithProps)
utils.setup_dummy_db() utils.setup_dummy_db()
@ -1373,7 +1369,7 @@ class StackServiceTest(HeatTestCase):
self.eng = service.EngineService('a-host', 'a-topic') self.eng = service.EngineService('a-host', 'a-topic')
cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role') cfg.CONF.set_default('heat_stack_user_role', 'stack_user_role')
_register_class('ResourceWithPropsType', res._register_class('ResourceWithPropsType',
generic_rsrc.ResourceWithProps) generic_rsrc.ResourceWithProps)
utils.setup_dummy_db() utils.setup_dummy_db()
@ -1495,7 +1491,7 @@ class StackServiceTest(HeatTestCase):
@stack_context('event_list_deleted_stack') @stack_context('event_list_deleted_stack')
def test_stack_event_list_deleted_resource(self): def test_stack_event_list_deleted_resource(self):
rsrs._register_class('GenericResourceType', res._register_class('GenericResourceType',
generic_rsrc.GenericResource) generic_rsrc.GenericResource)
thread = self.m.CreateMockAnything() thread = self.m.CreateMockAnything()
@ -2045,8 +2041,8 @@ class StackServiceTest(HeatTestCase):
service.EngineService.load_user_creds( service.EngineService.load_user_creds(
mox.IgnoreArg()).AndReturn(self.ctx) mox.IgnoreArg()).AndReturn(self.ctx)
self.m.StubOutWithMock(rsrs.Resource, 'signal') self.m.StubOutWithMock(res.Resource, 'signal')
rsrs.Resource.signal(mox.IgnoreArg()).AndReturn(None) res.Resource.signal(mox.IgnoreArg()).AndReturn(None)
self.m.ReplayAll() self.m.ReplayAll()
self.eng.resource_signal(self.ctx, self.eng.resource_signal(self.ctx,

13
heat/tests/test_environment.py
View File

@ -11,22 +11,21 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import fixtures
import mock
import os.path import os.path
import sys import sys
import fixtures
import mock
from oslo.config import cfg from oslo.config import cfg
cfg.CONF.import_opt('environment_dir', 'heat.common.config')
from heat.common import environment_format from heat.common import environment_format
from heat.engine import environment from heat.engine import environment
from heat.engine import resources from heat.engine import resources
from heat.tests import generic_resource
from heat.tests import common from heat.tests import common
from heat.tests import generic_resource
cfg.CONF.import_opt('environment_dir', 'heat.common.config')
class EnvironmentTest(common.HeatTestCase): class EnvironmentTest(common.HeatTestCase):

10
heat/tests/test_event.py
View File

@ -13,19 +13,17 @@
from oslo.config import cfg from oslo.config import cfg
cfg.CONF.import_opt('event_purge_batch_size', 'heat.common.config') from heat.db import api as db_api
cfg.CONF.import_opt('max_events_per_stack', 'heat.common.config') from heat.engine import event
import heat.db.api as db_api
from heat.engine import parser from heat.engine import parser
from heat.engine import resource from heat.engine import resource
from heat.engine import template from heat.engine import template
from heat.engine import event
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import generic_resource as generic_rsrc from heat.tests import generic_resource as generic_rsrc
from heat.tests import utils from heat.tests import utils
cfg.CONF.import_opt('event_purge_batch_size', 'heat.common.config')
cfg.CONF.import_opt('max_events_per_stack', 'heat.common.config')
tmpl = { tmpl = {
'Resources': { 'Resources': {

10
heat/tests/test_heat_autoscaling_group.py
View File

@ -17,18 +17,14 @@ from oslo.config import cfg
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine import clients from heat.engine import clients
from heat.engine import resource from heat.engine import resource
from heat.engine import scheduler from heat.engine import scheduler
from heat.openstack.common import timeutils from heat.openstack.common import timeutils
from heat.tests import fakes
from heat.tests import utils
from heat.tests import generic_resource
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import generic_resource
from heat.tests import utils
class AutoScalingGroupTest(HeatTestCase): class AutoScalingGroupTest(HeatTestCase):

14
heat/tests/test_hot.py
View File

@ -10,24 +10,24 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from heat.common import template_format
from heat.common import exception from heat.common import exception
from heat.common import identifier from heat.common import identifier
from heat.common import template_format
from heat.engine import constraints
from heat.engine import environment from heat.engine import environment
from heat.engine import function from heat.engine import function
from heat.engine import parser
from heat.engine import resource
from heat.engine.hot import parameters as hot_param from heat.engine.hot import parameters as hot_param
from heat.engine.hot import template as hot_template from heat.engine.hot import template as hot_template
from heat.engine import parameters
from heat.engine import parser
from heat.engine import resource
from heat.engine import resources from heat.engine import resources
from heat.engine import template from heat.engine import template
from heat.engine import constraints
from heat.engine import parameters
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import generic_resource as generic_rsrc
from heat.tests import test_parser from heat.tests import test_parser
from heat.tests import utils from heat.tests import utils
from heat.tests import generic_resource as generic_rsrc
hot_tpl_empty = template_format.parse(''' hot_tpl_empty = template_format.parse('''

9
heat/tests/test_instance.py
View File

@ -15,24 +15,23 @@ import copy
import uuid import uuid
import mox import mox
from neutronclient.v2_0 import client as neutronclient
from heat.engine import environment
from heat.tests.v1_1 import fakes
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine import clients from heat.engine import clients
from heat.engine import environment
from heat.engine import parser from heat.engine import parser
from heat.engine import resource from heat.engine import resource
from heat.engine import scheduler
from heat.engine.resources import image from heat.engine.resources import image
from heat.engine.resources import instance as instances from heat.engine.resources import instance as instances
from heat.engine.resources import network_interface from heat.engine.resources import network_interface
from heat.engine.resources import nova_utils from heat.engine.resources import nova_utils
from heat.engine import scheduler
from heat.openstack.common import uuidutils from heat.openstack.common import uuidutils
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes
from neutronclient.v2_0 import client as neutronclient
wp_template = ''' wp_template = '''

7
heat/tests/test_instance_group.py
View File

@ -12,17 +12,18 @@
# under the License. # under the License.
import copy import copy
import mox import mox
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine import parser
from heat.engine import resource
from heat.engine import resources
from heat.engine.resources import image from heat.engine.resources import image
from heat.engine.resources import instance from heat.engine.resources import instance
from heat.engine.resources import nova_keypair from heat.engine.resources import nova_keypair
from heat.engine import resource
from heat.engine import resources
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import parser
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils

7
heat/tests/test_instance_group_update_policy.py
View File

@ -11,9 +11,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import mox
import json
import copy import copy
import json
import mox
from testtools.matchers import MatchesRegex
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
@ -24,7 +26,6 @@ from heat.engine.resources import nova_keypair
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes from heat.tests.v1_1 import fakes
from testtools.matchers import MatchesRegex
ig_tmpl_without_updt_policy = ''' ig_tmpl_without_updt_policy = '''

8
heat/tests/test_instance_network.py
View File

@ -13,17 +13,17 @@
import uuid import uuid
from heat.common import template_format
from heat.engine import clients
from heat.engine import environment from heat.engine import environment
from heat.tests.v1_1 import fakes from heat.engine import parser
from heat.engine.resources import instance as instances from heat.engine.resources import instance as instances
from heat.engine.resources import network_interface as network_interfaces from heat.engine.resources import network_interface as network_interfaces
from heat.engine.resources import nova_utils from heat.engine.resources import nova_utils
from heat.common import template_format
from heat.engine import clients
from heat.engine import parser
from heat.engine import scheduler from heat.engine import scheduler
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes
wp_template = ''' wp_template = '''

12
heat/tests/test_loadbalancer.py
View File

@ -11,25 +11,25 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import re
import mock import mock
import mox import mox
import re
from oslo.config import cfg from oslo.config import cfg
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine import clients from heat.engine import clients
from heat.engine import scheduler from heat.engine.resource import Metadata
from heat.engine import stack_user
from heat.engine.resources import instance from heat.engine.resources import instance
from heat.engine.resources import loadbalancer as lb from heat.engine.resources import loadbalancer as lb
from heat.engine.resources import wait_condition as wc from heat.engine.resources import wait_condition as wc
from heat.engine.resource import Metadata from heat.engine import scheduler
from heat.engine import stack_user
from heat.tests.common import HeatTestCase from heat.tests.common import HeatTestCase
from heat.tests import fakes as test_fakes
from heat.tests import utils from heat.tests import utils
from heat.tests.v1_1 import fakes from heat.tests.v1_1 import fakes
from heat.tests import fakes as test_fakes
lb_template = ''' lb_template = '''

13
heat/tests/test_metadata_refresh.py
View File

@ -13,22 +13,21 @@
import mox import mox
from oslo.config import cfg from oslo.config import cfg
from heat.tests import fakes
from heat.tests.common import HeatTestCase
from heat.tests import utils
from heat.engine import environment
from heat.common import identifier from heat.common import identifier
from heat.common import template_format from heat.common import template_format
from heat.engine import environment
from heat.engine import parser from heat.engine import parser
from heat.engine import scheduler
from heat.engine import service
from heat.engine.resources import image from heat.engine.resources import image
from heat.engine.resources import instance from heat.engine.resources import instance
from heat.engine.resources import nova_keypair from heat.engine.resources import nova_keypair
from heat.engine.resources import wait_condition as wc from heat.engine.resources import wait_condition as wc
from heat.engine import scheduler
from heat.engine import service
from heat.tests.common import HeatTestCase
from heat.tests import fakes
from heat.tests import utils
test_template_metadata = ''' test_template_metadata = '''

2
heat/tests/v1_1/fakes.py
View File

@ -17,9 +17,9 @@ import httplib2
from novaclient import client as base_client from novaclient import client as base_client
from novaclient.v1_1 import client from novaclient.v1_1 import client
from heat.tests import fakes
from heat.openstack.common.py3kcompat import urlutils from heat.openstack.common.py3kcompat import urlutils
from heat.tests import fakes
class FakeClient(fakes.FakeClient, client.Client): class FakeClient(fakes.FakeClient, client.Client):