diff options
Diffstat (limited to 'heat')
39 files changed, 81 insertions, 107 deletions
diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py index e29a76ba8..b0c471807 100644 --- a/heat/engine/resources/autoscaling.py +++ b/heat/engine/resources/autoscaling.py @@ -16,22 +16,21 @@ import functools import json import math -from heat.engine import environment -from heat.engine import function -from heat.engine import resource -from heat.engine import signal_responder - from heat.common import exception from heat.common import timeutils as iso8601utils -from heat.openstack.common import excutils -from heat.openstack.common import log as logging -from heat.openstack.common import timeutils -from heat.engine.properties import Properties from heat.engine import constraints +from heat.engine import environment +from heat.engine import function from heat.engine.notification import autoscaling as notification from heat.engine import properties +from heat.engine.properties import Properties +from heat.engine import resource from heat.engine import scheduler +from heat.engine import signal_responder from heat.engine import stack_resource +from heat.openstack.common import excutils +from heat.openstack.common import log as logging +from heat.openstack.common import timeutils from heat.scaling import template logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py index 9470625cc..549b1955e 100644 --- a/heat/engine/resources/cloud_watch.py +++ b/heat/engine/resources/cloud_watch.py @@ -13,12 +13,11 @@ # under the License. from heat.common import exception -from heat.engine import watchrule from heat.engine import constraints from heat.engine import properties -from heat.engine import resource from heat.engine.properties import Properties - +from heat.engine import resource +from heat.engine import watchrule from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/eip.py index 0808d3698..aa9205516 100644 --- a/heat/engine/resources/eip.py +++ b/heat/engine/resources/eip.py @@ -12,16 +12,15 @@ # License for the specific language governing permissions and limitations # under the License. +from heat.common import exception from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine import resource from heat.engine.resources.vpc import VPC -from heat.common import exception - from heat.openstack.common import excutils -from heat.openstack.common import log as logging from heat.openstack.common.gettextutils import _ +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index c43de4119..48f29dfd6 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -12,19 +12,17 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.engine import signal_responder +from heat.common import exception from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import scheduler +from heat.engine.resources.network_interface import NetworkInterface from heat.engine.resources.neutron import neutron from heat.engine.resources import nova_utils from heat.engine.resources import volume - -from heat.common import exception -from heat.engine.resources.network_interface import NetworkInterface - +from heat.engine import scheduler +from heat.engine import signal_responder from heat.openstack.common.gettextutils import _ from heat.openstack.common import log as logging diff --git a/heat/engine/resources/internet_gateway.py b/heat/engine/resources/internet_gateway.py index 51d82cbde..a6908e975 100644 --- a/heat/engine/resources/internet_gateway.py +++ b/heat/engine/resources/internet_gateway.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.engine import clients from heat.common import exception -from heat.openstack.common import log as logging -from heat.openstack.common.gettextutils import _ +from heat.engine import clients from heat.engine import properties from heat.engine import resource from heat.engine.resources import route_table +from heat.openstack.common.gettextutils import _ +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/loadbalancer.py index 14b4c5916..23b43bed7 100644 --- a/heat/engine/resources/loadbalancer.py +++ b/heat/engine/resources/loadbalancer.py @@ -19,11 +19,10 @@ from heat.common import exception from heat.common import template_format from heat.engine import constraints from heat.engine import properties -from heat.engine import stack_resource from heat.engine.resources import nova_utils - -from heat.openstack.common import log as logging +from heat.engine import stack_resource from heat.openstack.common.gettextutils import _ +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/network_interface.py b/heat/engine/resources/network_interface.py index 4ae63b63f..7af5e7688 100644 --- a/heat/engine/resources/network_interface.py +++ b/heat/engine/resources/network_interface.py @@ -13,10 +13,10 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging from heat.engine import properties from heat.engine import resource from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/neutron/firewall.py b/heat/engine/resources/neutron/firewall.py index a795d79a1..656fbcc00 100644 --- a/heat/engine/resources/neutron/firewall.py +++ b/heat/engine/resources/neutron/firewall.py @@ -12,15 +12,14 @@ # under the License. from heat.engine import clients -from heat.engine.resources.neutron import neutron from heat.engine import constraints from heat.engine import properties +from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException -from heat.openstack.common import log as logging - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/neutron/floatingip.py b/heat/engine/resources/neutron/floatingip.py index b884427ff..8c1b30fbf 100644 --- a/heat/engine/resources/neutron/floatingip.py +++ b/heat/engine/resources/neutron/floatingip.py @@ -13,10 +13,10 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging from heat.engine import properties from heat.engine.resources.neutron import neutron from heat.engine.resources.neutron import router +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException diff --git a/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/neutron/loadbalancer.py index bb132d744..346e1e8c4 100644 --- a/heat/engine/resources/neutron/loadbalancer.py +++ b/heat/engine/resources/neutron/loadbalancer.py @@ -18,9 +18,9 @@ from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import scheduler -from heat.engine.resources import nova_utils from heat.engine.resources.neutron import neutron +from heat.engine.resources import nova_utils +from heat.engine import scheduler if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException diff --git a/heat/engine/resources/neutron/net.py b/heat/engine/resources/neutron/net.py index 1e34be8d5..756da90b7 100644 --- a/heat/engine/resources/neutron/net.py +++ b/heat/engine/resources/neutron/net.py @@ -13,9 +13,9 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging -from heat.engine.resources.neutron import neutron from heat.engine import properties +from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging if clients.neutronclient is not None: import neutronclient.common.exceptions as neutron_exp diff --git a/heat/engine/resources/neutron/network_gateway.py b/heat/engine/resources/neutron/network_gateway.py index 9d52af495..ff047503e 100644 --- a/heat/engine/resources/neutron/network_gateway.py +++ b/heat/engine/resources/neutron/network_gateway.py @@ -19,12 +19,11 @@ from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException -from heat.openstack.common import log as logging - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/neutron/neutron.py b/heat/engine/resources/neutron/neutron.py index 54a202f10..868b19249 100644 --- a/heat/engine/resources/neutron/neutron.py +++ b/heat/engine/resources/neutron/neutron.py @@ -18,7 +18,6 @@ from heat.common import exception from heat.engine.properties import Properties from heat.engine import resource from heat.engine import scheduler - from heat.openstack.common import log as logging from heat.openstack.common import uuidutils diff --git a/heat/engine/resources/neutron/port.py b/heat/engine/resources/neutron/port.py index 6a4ae7ba7..c6f9b95e7 100644 --- a/heat/engine/resources/neutron/port.py +++ b/heat/engine/resources/neutron/port.py @@ -13,10 +13,10 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging +from heat.engine import properties from heat.engine.resources.neutron import neutron from heat.engine.resources.neutron import subnet -from heat.engine import properties +from heat.openstack.common import log as logging if clients.neutronclient is not None: import neutronclient.common.exceptions as neutron_exp diff --git a/heat/engine/resources/neutron/provider_net.py b/heat/engine/resources/neutron/provider_net.py index f4abf36c1..c1f9b9ed8 100644 --- a/heat/engine/resources/neutron/provider_net.py +++ b/heat/engine/resources/neutron/provider_net.py @@ -11,10 +11,10 @@ # License for the specific language governing permissions and limitations # under the License. +from heat.common import exception from heat.engine import clients -from heat.engine import properties from heat.engine import constraints -from heat.common import exception +from heat.engine import properties from heat.engine.resources.neutron import net diff --git a/heat/engine/resources/neutron/router.py b/heat/engine/resources/neutron/router.py index 0b6b4a6d7..d35c4f00a 100644 --- a/heat/engine/resources/neutron/router.py +++ b/heat/engine/resources/neutron/router.py @@ -14,17 +14,16 @@ from heat.common import exception from heat.engine import clients -from heat.engine import support +from heat.engine import properties from heat.engine.resources.neutron import neutron from heat.engine.resources.neutron import subnet -from heat.engine import properties +from heat.engine import support +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException from neutronclient.neutron import v2_0 as neutronV20 -from heat.openstack.common import log as logging - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/neutron/security_group.py b/heat/engine/resources/neutron/security_group.py index adeae2577..35d3bf78f 100644 --- a/heat/engine/resources/neutron/security_group.py +++ b/heat/engine/resources/neutron/security_group.py @@ -14,8 +14,8 @@ from heat.common import exception from heat.engine import clients -from heat.engine import properties from heat.engine import constraints +from heat.engine import properties from heat.engine.resources.neutron import neutron from heat.openstack.common import log as logging diff --git a/heat/engine/resources/neutron/subnet.py b/heat/engine/resources/neutron/subnet.py index c2fe64b20..b1125df0e 100644 --- a/heat/engine/resources/neutron/subnet.py +++ b/heat/engine/resources/neutron/subnet.py @@ -13,10 +13,10 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging -from heat.engine.resources.neutron import neutron from heat.engine import constraints from heat.engine import properties +from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException diff --git a/heat/engine/resources/neutron/vpnservice.py b/heat/engine/resources/neutron/vpnservice.py index 8a9047b58..06e63ecff 100644 --- a/heat/engine/resources/neutron/vpnservice.py +++ b/heat/engine/resources/neutron/vpnservice.py @@ -13,15 +13,14 @@ # under the License. from heat.engine import clients -from heat.engine.resources.neutron import neutron from heat.engine import constraints from heat.engine import properties +from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException -from heat.openstack.common import log as logging - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/nova_floatingip.py b/heat/engine/resources/nova_floatingip.py index aa01a6baf..1ec2c5a7f 100644 --- a/heat/engine/resources/nova_floatingip.py +++ b/heat/engine/resources/nova_floatingip.py @@ -13,10 +13,9 @@ from heat.engine import clients from heat.engine import properties from heat.engine import resource - from heat.openstack.common import excutils -from heat.openstack.common import log as logging from heat.openstack.common.gettextutils import _ +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/nova_keypair.py b/heat/engine/resources/nova_keypair.py index e60771f45..f708f2614 100644 --- a/heat/engine/resources/nova_keypair.py +++ b/heat/engine/resources/nova_keypair.py @@ -10,6 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. +from novaclient import exceptions as nova_exceptions + from heat.common import exception from heat.db import api as db_api from heat.engine.clients import Clients @@ -19,8 +21,6 @@ from heat.engine.resources import nova_utils from heat.openstack.common.gettextutils import _ from heat.openstack.common import log as logging -from novaclient import exceptions as nova_exceptions - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/nova_utils.py b/heat/engine/resources/nova_utils.py index 0b113baaa..32070d7cb 100644 --- a/heat/engine/resources/nova_utils.py +++ b/heat/engine/resources/nova_utils.py @@ -16,22 +16,20 @@ import email from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText - import json import os import pkgutil -import six from oslo.config import cfg +import six from heat.common import exception from heat.engine import clients from heat.engine import scheduler -from heat.openstack.common import log as logging from heat.openstack.common.gettextutils import _ -from heat.openstack.common import uuidutils +from heat.openstack.common import log as logging from heat.openstack.common.py3kcompat import urlutils - +from heat.openstack.common import uuidutils logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/os_database.py b/heat/engine/resources/os_database.py index 476962360..35029c31a 100644 --- a/heat/engine/resources/os_database.py +++ b/heat/engine/resources/os_database.py @@ -13,14 +13,13 @@ # under the License. from heat.common import exception +from heat.engine.clients import troveclient from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine.clients import troveclient from heat.engine.resources import nova_utils -from heat.openstack.common import log as logging from heat.openstack.common.gettextutils import _ - +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/random_string.py b/heat/engine/resources/random_string.py index fc7d2af46..3c384e850 100644 --- a/heat/engine/resources/random_string.py +++ b/heat/engine/resources/random_string.py @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.db import api as db_api -from heat.engine import resource -from heat.engine import properties -from heat.engine import constraints - import random import string +from heat.db import api as db_api +from heat.engine import constraints +from heat.engine import properties +from heat.engine import resource + class RandomString(resource.Resource): ''' diff --git a/heat/engine/resources/resource_group.py b/heat/engine/resources/resource_group.py index edc54092d..afa70d1ff 100644 --- a/heat/engine/resources/resource_group.py +++ b/heat/engine/resources/resource_group.py @@ -14,14 +14,14 @@ import copy +from heat.common import exception +from heat.engine import constraints from heat.engine import parser from heat.engine import properties -from heat.engine import constraints from heat.engine import stack_resource -from heat.common import exception - from heat.openstack.common.gettextutils import _ + template_template = { "heat_template_version": "2013-05-23", "resources": {} diff --git a/heat/engine/resources/route_table.py b/heat/engine/resources/route_table.py index af8c7e2ea..9183d20a3 100644 --- a/heat/engine/resources/route_table.py +++ b/heat/engine/resources/route_table.py @@ -13,11 +13,11 @@ # under the License. from heat.engine import clients -from heat.openstack.common import log as logging from heat.engine import properties from heat.engine import resource from heat.engine.resources.neutron import neutron from heat.engine.resources.vpc import VPC +from heat.openstack.common import log as logging if clients.neutronclient is not None: from neutronclient.common.exceptions import NeutronClientException diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/s3.py index bde3cc7b0..85dacb64c 100644 --- a/heat/engine/resources/s3.py +++ b/heat/engine/resources/s3.py @@ -16,11 +16,9 @@ from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine import resource - from heat.openstack.common import log as logging from heat.openstack.common.py3kcompat import urlutils - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py index 6cf369aea..81c0360f6 100644 --- a/heat/engine/resources/security_group.py +++ b/heat/engine/resources/security_group.py @@ -12,11 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from heat.common import exception from heat.engine import clients from heat.engine import properties from heat.engine import resource - -from heat.common import exception from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/server.py b/heat/engine/resources/server.py index 3853a78b6..cdb97bf80 100644 --- a/heat/engine/resources/server.py +++ b/heat/engine/resources/server.py @@ -15,23 +15,23 @@ from oslo.config import cfg import uuid -cfg.CONF.import_opt('instance_user', 'heat.common.config') - from heat.common import exception from heat.db import api as db_api from heat.engine import clients -from heat.engine import scheduler -from heat.engine import stack_user -from heat.engine.resources import nova_utils -from heat.engine.resources.software_config import software_config as sc from heat.engine import constraints from heat.engine import properties from heat.engine import resource +from heat.engine.resources import nova_utils +from heat.engine.resources.software_config import software_config as sc +from heat.engine import scheduler +from heat.engine import stack_user from heat.engine import support from heat.openstack.common.gettextutils import _ from heat.openstack.common import log as logging from heat.openstack.common import uuidutils +cfg.CONF.import_opt('instance_user', 'heat.common.config') + logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/software_config/software_config.py b/heat/engine/resources/software_config/software_config.py index fc3ac72be..81062bd07 100644 --- a/heat/engine/resources/software_config/software_config.py +++ b/heat/engine/resources/software_config/software_config.py @@ -12,6 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. +import heatclient.exc as heat_exp + from heat.common import exception from heat.engine import constraints from heat.engine import properties @@ -19,8 +21,6 @@ from heat.engine import resource from heat.openstack.common.gettextutils import _ from heat.openstack.common import log as logging -import heatclient.exc as heat_exp - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/software_config/software_deployment.py b/heat/engine/resources/software_config/software_deployment.py index 9723d452b..2c22cb9db 100644 --- a/heat/engine/resources/software_config/software_deployment.py +++ b/heat/engine/resources/software_config/software_deployment.py @@ -16,17 +16,17 @@ import copy import uuid +import heatclient.exc as heat_exp + +from heat.common import exception from heat.db import api as db_api from heat.engine import constraints -from heat.common import exception from heat.engine import properties -from heat.engine import signal_responder from heat.engine import resource from heat.engine.resources.software_config import software_config as sc +from heat.engine import signal_responder from heat.openstack.common import log as logging -import heatclient.exc as heat_exp - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py index acc5ce324..b6287a14d 100644 --- a/heat/engine/resources/stack.py +++ b/heat/engine/resources/stack.py @@ -17,10 +17,9 @@ from requests import exceptions from heat.common import exception from heat.common import template_format from heat.common import urlfetch -from heat.engine.properties import Properties from heat.engine import properties +from heat.engine.properties import Properties from heat.engine import stack_resource - from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/subnet.py b/heat/engine/resources/subnet.py index 1e8e4316c..268578d47 100644 --- a/heat/engine/resources/subnet.py +++ b/heat/engine/resources/subnet.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. -from heat.engine import clients from heat.common import exception -from heat.openstack.common import log as logging +from heat.engine import clients from heat.engine import properties from heat.engine import resource from heat.engine.resources.vpc import VPC +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/swift.py b/heat/engine/resources/swift.py index f5a3e944c..66ba607c9 100644 --- a/heat/engine/resources/swift.py +++ b/heat/engine/resources/swift.py @@ -13,14 +13,12 @@ # under the License. from heat.common import exception +from heat.engine import clients from heat.engine import properties from heat.engine import resource -from heat.engine import clients - from heat.openstack.common import log as logging from heat.openstack.common.py3kcompat import urlutils - logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/template_resource.py b/heat/engine/resources/template_resource.py index 8fb6e9427..0182433ee 100644 --- a/heat/engine/resources/template_resource.py +++ b/heat/engine/resources/template_resource.py @@ -14,10 +14,10 @@ import hashlib import json + from requests import exceptions from heat.common import exception - from heat.common import template_format from heat.common import urlfetch from heat.engine import attributes @@ -25,7 +25,6 @@ from heat.engine import environment from heat.engine import properties from heat.engine import stack_resource from heat.engine import template - from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index d1917bf61..b4e1ce5e9 100644 --- a/heat/engine/resources/user.py +++ b/heat/engine/resources/user.py @@ -18,10 +18,8 @@ from heat.engine import constraints from heat.engine import properties from heat.engine import resource from heat.engine import stack_user - from heat.openstack.common import log as logging - logger = logging.getLogger(__name__) # diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index 585331380..8b55eebe9 100644 --- a/heat/engine/resources/volume.py +++ b/heat/engine/resources/volume.py @@ -14,17 +14,16 @@ import json -from heat.openstack.common import log as logging -from heat.openstack.common.importutils import try_import - from heat.common import exception from heat.engine import clients from heat.engine import constraints from heat.engine import properties from heat.engine import resource -from heat.engine import support from heat.engine.resources import nova_utils from heat.engine import scheduler +from heat.engine import support +from heat.openstack.common.importutils import try_import +from heat.openstack.common import log as logging volume_backups = try_import('cinderclient.v1.volume_backups') diff --git a/heat/engine/resources/vpc.py b/heat/engine/resources/vpc.py index ee8538b00..11bd8ec1c 100644 --- a/heat/engine/resources/vpc.py +++ b/heat/engine/resources/vpc.py @@ -14,11 +14,11 @@ from heat.common import exception from heat.engine import clients -from heat.openstack.common import log as logging from heat.engine import constraints from heat.engine import properties from heat.engine import resource from heat.engine.resources.neutron import neutron +from heat.openstack.common import log as logging logger = logging.getLogger(__name__) diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index 9144216fc..05d66a4ff 100644 --- a/heat/engine/resources/wait_condition.py +++ b/heat/engine/resources/wait_condition.py @@ -20,7 +20,6 @@ from heat.engine import properties from heat.engine import resource from heat.engine import scheduler from heat.engine import signal_responder - from heat.openstack.common import log as logging logger = logging.getLogger(__name__) |