diff options
Diffstat (limited to 'heat/tests/openstack')
122 files changed, 142 insertions, 135 deletions
diff --git a/heat/tests/openstack/aodh/test_alarm.py b/heat/tests/openstack/aodh/test_alarm.py index 9197dd5a2..cb5b6fb53 100644 --- a/heat/tests/openstack/aodh/test_alarm.py +++ b/heat/tests/openstack/aodh/test_alarm.py @@ -14,8 +14,7 @@ import copy import json - -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/aodh/test_composite_alarm.py b/heat/tests/openstack/aodh/test_composite_alarm.py index 6afdb9efb..1d43af681 100644 --- a/heat/tests/openstack/aodh/test_composite_alarm.py +++ b/heat/tests/openstack/aodh/test_composite_alarm.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/aodh/test_gnocchi_alarm.py b/heat/tests/openstack/aodh/test_gnocchi_alarm.py index 1d554efbe..2747b707b 100644 --- a/heat/tests/openstack/aodh/test_gnocchi_alarm.py +++ b/heat/tests/openstack/aodh/test_gnocchi_alarm.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/barbican/test_container.py b/heat/tests/openstack/barbican/test_container.py index 1bf7ef5df..1309dcede 100644 --- a/heat/tests/openstack/barbican/test_container.py +++ b/heat/tests/openstack/barbican/test_container.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/barbican/test_order.py b/heat/tests/openstack/barbican/test_order.py index 8cac6b72f..c464b3fa4 100644 --- a/heat/tests/openstack/barbican/test_order.py +++ b/heat/tests/openstack/barbican/test_order.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/barbican/test_secret.py b/heat/tests/openstack/barbican/test_secret.py index ffcea6f8f..673ef40da 100644 --- a/heat/tests/openstack/barbican/test_secret.py +++ b/heat/tests/openstack/barbican/test_secret.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/blazar/test_host.py b/heat/tests/openstack/blazar/test_host.py index ab3d750a9..6021b6a8c 100644 --- a/heat/tests/openstack/blazar/test_host.py +++ b/heat/tests/openstack/blazar/test_host.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from blazarclient import exception as client_exception -import mock from oslo_utils.fixture import uuidsentinel as uuids from heat.common import exception diff --git a/heat/tests/openstack/blazar/test_lease.py b/heat/tests/openstack/blazar/test_lease.py index 4991a14d2..00938e3a6 100644 --- a/heat/tests/openstack/blazar/test_lease.py +++ b/heat/tests/openstack/blazar/test_lease.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from blazarclient import exception as client_exception -import mock from oslo_utils.fixture import uuidsentinel as uuids from heat.common import exception diff --git a/heat/tests/openstack/cinder/test_qos_specs.py b/heat/tests/openstack/cinder/test_qos_specs.py index b77cd728f..fc5178aa5 100644 --- a/heat/tests/openstack/cinder/test_qos_specs.py +++ b/heat/tests/openstack/cinder/test_qos_specs.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import cinder as c_plugin from heat.engine.resources.openstack.cinder import qos_specs diff --git a/heat/tests/openstack/cinder/test_quota.py b/heat/tests/openstack/cinder/test_quota.py index c1b1213ef..62312f284 100644 --- a/heat/tests/openstack/cinder/test_quota.py +++ b/heat/tests/openstack/cinder/test_quota.py @@ -10,7 +10,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/cinder/test_volume.py b/heat/tests/openstack/cinder/test_volume.py index 2d4e302b7..6a2cc5ea9 100644 --- a/heat/tests/openstack/cinder/test_volume.py +++ b/heat/tests/openstack/cinder/test_volume.py @@ -14,9 +14,9 @@ import collections import copy import json +from unittest import mock from cinderclient import exceptions as cinder_exp -import mock from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/cinder/test_volume_type.py b/heat/tests/openstack/cinder/test_volume_type.py index e8d904c51..de094fb24 100644 --- a/heat/tests/openstack/cinder/test_volume_type.py +++ b/heat/tests/openstack/cinder/test_volume_type.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. import collections -import mock +from unittest import mock from heat.common import exception from heat.engine.clients.os import cinder as c_plugin diff --git a/heat/tests/openstack/cinder/test_volume_type_encryption.py b/heat/tests/openstack/cinder/test_volume_type_encryption.py index 08815b7bc..563c35aa4 100644 --- a/heat/tests/openstack/cinder/test_volume_type_encryption.py +++ b/heat/tests/openstack/cinder/test_volume_type_encryption.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.engine.clients.os import cinder as c_plugin diff --git a/heat/tests/openstack/cinder/test_volume_utils.py b/heat/tests/openstack/cinder/test_volume_utils.py index 376bb84dd..549d98058 100644 --- a/heat/tests/openstack/cinder/test_volume_utils.py +++ b/heat/tests/openstack/cinder/test_volume_utils.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from cinderclient.v2 import client as cinderclient -import mock from heat.engine.clients.os import cinder from heat.engine.clients.os import nova diff --git a/heat/tests/openstack/designate/test_recordset.py b/heat/tests/openstack/designate/test_recordset.py index c2166ed91..53d56fba3 100644 --- a/heat/tests/openstack/designate/test_recordset.py +++ b/heat/tests/openstack/designate/test_recordset.py @@ -11,8 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock + from designateclient import exceptions as designate_exception -import mock from heat.common import exception from heat.engine.resources.openstack.designate import recordset diff --git a/heat/tests/openstack/designate/test_zone.py b/heat/tests/openstack/designate/test_zone.py index 8f5a0288c..7956ce13f 100644 --- a/heat/tests/openstack/designate/test_zone.py +++ b/heat/tests/openstack/designate/test_zone.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.engine.resources.openstack.designate import zone diff --git a/heat/tests/openstack/glance/test_image.py b/heat/tests/openstack/glance/test_image.py index 73f47a81a..62359d9e6 100644 --- a/heat/tests/openstack/glance/test_image.py +++ b/heat/tests/openstack/glance/test_image.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from glanceclient import exc from heat.common import exception diff --git a/heat/tests/openstack/heat/test_cloud_config.py b/heat/tests/openstack/heat/test_cloud_config.py index 9f740da5b..90fc7fbfe 100644 --- a/heat/tests/openstack/heat/test_cloud_config.py +++ b/heat/tests/openstack/heat/test_cloud_config.py @@ -11,10 +11,10 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid import yaml -import mock from heat.engine import stack from heat.engine import template diff --git a/heat/tests/openstack/heat/test_deployed_server.py b/heat/tests/openstack/heat/test_deployed_server.py index 86761e6b6..ba459c12b 100644 --- a/heat/tests/openstack/heat/test_deployed_server.py +++ b/heat/tests/openstack/heat/test_deployed_server.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils diff --git a/heat/tests/openstack/heat/test_instance_group.py b/heat/tests/openstack/heat/test_instance_group.py index 45e3b5c1c..92b1b580a 100644 --- a/heat/tests/openstack/heat/test_instance_group.py +++ b/heat/tests/openstack/heat/test_instance_group.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.common import exception from heat.common import grouputils diff --git a/heat/tests/openstack/heat/test_instance_group_update_policy.py b/heat/tests/openstack/heat/test_instance_group_update_policy.py index 9ece3aa28..759b20e5e 100644 --- a/heat/tests/openstack/heat/test_instance_group_update_policy.py +++ b/heat/tests/openstack/heat/test_instance_group_update_policy.py @@ -12,8 +12,8 @@ # under the License. import json +from unittest import mock -import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/heat/test_multi_part.py b/heat/tests/openstack/heat/test_multi_part.py index 3d2b244c8..ad8d676c1 100644 --- a/heat/tests/openstack/heat/test_multi_part.py +++ b/heat/tests/openstack/heat/test_multi_part.py @@ -13,10 +13,9 @@ import contextlib import email +from unittest import mock import uuid -import mock - from heat.common import exception as exc from heat.engine import stack as parser from heat.engine import template diff --git a/heat/tests/openstack/heat/test_none_resource.py b/heat/tests/openstack/heat/test_none_resource.py index 13370ebaf..7344b36e5 100644 --- a/heat/tests/openstack/heat/test_none_resource.py +++ b/heat/tests/openstack/heat/test_none_resource.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine import resource diff --git a/heat/tests/openstack/heat/test_random_string.py b/heat/tests/openstack/heat/test_random_string.py index 3eeb8c45c..6b36818ac 100644 --- a/heat/tests/openstack/heat/test_random_string.py +++ b/heat/tests/openstack/heat/test_random_string.py @@ -12,8 +12,8 @@ # under the License. import re +from unittest import mock -import mock from testtools import matchers from heat.common import exception diff --git a/heat/tests/openstack/heat/test_remote_stack.py b/heat/tests/openstack/heat/test_remote_stack.py index 02768cf8c..b5df410a2 100644 --- a/heat/tests/openstack/heat/test_remote_stack.py +++ b/heat/tests/openstack/heat/test_remote_stack.py @@ -13,11 +13,11 @@ import collections import json +from unittest import mock from heatclient import exc from heatclient.v1 import stacks from keystoneauth1 import loading as ks_loading -import mock from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/heat/test_resource_chain.py b/heat/tests/openstack/heat/test_resource_chain.py index 2ec1f5463..960c9ac3b 100644 --- a/heat/tests/openstack/heat/test_resource_chain.py +++ b/heat/tests/openstack/heat/test_resource_chain.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from heat.common import exception from heat.engine import node_data diff --git a/heat/tests/openstack/heat/test_resource_group.py b/heat/tests/openstack/heat/test_resource_group.py index bd39bc1ad..1355709ca 100644 --- a/heat/tests/openstack/heat/test_resource_group.py +++ b/heat/tests/openstack/heat/test_resource_group.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.common import exception from heat.common import grouputils diff --git a/heat/tests/openstack/heat/test_software_component.py b/heat/tests/openstack/heat/test_software_component.py index 5e0842c40..feae76c36 100644 --- a/heat/tests/openstack/heat/test_software_component.py +++ b/heat/tests/openstack/heat/test_software_component.py @@ -12,7 +12,7 @@ # under the License. import contextlib -import mock +from unittest import mock from heat.common import exception as exc from heat.common import template_format diff --git a/heat/tests/openstack/heat/test_software_config.py b/heat/tests/openstack/heat/test_software_config.py index 0ac5b643e..f194ec735 100644 --- a/heat/tests/openstack/heat/test_software_config.py +++ b/heat/tests/openstack/heat/test_software_config.py @@ -12,7 +12,7 @@ # under the License. import contextlib -import mock +from unittest import mock from heat.common import exception as exc from heat.engine import stack diff --git a/heat/tests/openstack/heat/test_software_deployment.py b/heat/tests/openstack/heat/test_software_deployment.py index b6f4349ca..307ec572f 100644 --- a/heat/tests/openstack/heat/test_software_deployment.py +++ b/heat/tests/openstack/heat/test_software_deployment.py @@ -14,10 +14,9 @@ import contextlib import copy import re +from unittest import mock import uuid -import mock - from oslo_serialization import jsonutils from heat.common import exception as exc diff --git a/heat/tests/openstack/heat/test_structured_config.py b/heat/tests/openstack/heat/test_structured_config.py index ba389c19f..fa5c7511e 100644 --- a/heat/tests/openstack/heat/test_structured_config.py +++ b/heat/tests/openstack/heat/test_structured_config.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.engine.resources.openstack.heat import structured_config as sc diff --git a/heat/tests/openstack/heat/test_swiftsignal.py b/heat/tests/openstack/heat/test_swiftsignal.py index c910d315a..c3d2db0d6 100644 --- a/heat/tests/openstack/heat/test_swiftsignal.py +++ b/heat/tests/openstack/heat/test_swiftsignal.py @@ -13,9 +13,9 @@ import datetime import json +from unittest import mock import uuid -import mock from oslo_utils import timeutils from swiftclient import client as swiftclient_client from swiftclient import exceptions as swiftclient_exceptions diff --git a/heat/tests/openstack/heat/test_waitcondition.py b/heat/tests/openstack/heat/test_waitcondition.py index 930598e7c..b3b17bb76 100644 --- a/heat/tests/openstack/heat/test_waitcondition.py +++ b/heat/tests/openstack/heat/test_waitcondition.py @@ -12,9 +12,9 @@ # under the License. import datetime +from unittest import mock import uuid -import mock from oslo_serialization import jsonutils as json from oslo_utils import timeutils diff --git a/heat/tests/openstack/keystone/test_domain.py b/heat/tests/openstack/keystone/test_domain.py index 1f6e45259..204b09205 100644 --- a/heat/tests/openstack/keystone/test_domain.py +++ b/heat/tests/openstack/keystone/test_domain.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import resource diff --git a/heat/tests/openstack/keystone/test_endpoint.py b/heat/tests/openstack/keystone/test_endpoint.py index 9bcc8b4c6..9a53476a1 100644 --- a/heat/tests/openstack/keystone/test_endpoint.py +++ b/heat/tests/openstack/keystone/test_endpoint.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import constraints diff --git a/heat/tests/openstack/keystone/test_group.py b/heat/tests/openstack/keystone/test_group.py index 680382030..01ecd9c93 100644 --- a/heat/tests/openstack/keystone/test_group.py +++ b/heat/tests/openstack/keystone/test_group.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import constraints diff --git a/heat/tests/openstack/keystone/test_project.py b/heat/tests/openstack/keystone/test_project.py index 9b3c4ef63..095251a29 100644 --- a/heat/tests/openstack/keystone/test_project.py +++ b/heat/tests/openstack/keystone/test_project.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine import constraints from heat.engine import properties diff --git a/heat/tests/openstack/keystone/test_region.py b/heat/tests/openstack/keystone/test_region.py index 0068c4ba2..bd3a3872f 100644 --- a/heat/tests/openstack/keystone/test_region.py +++ b/heat/tests/openstack/keystone/test_region.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from urllib import parse from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks diff --git a/heat/tests/openstack/keystone/test_role.py b/heat/tests/openstack/keystone/test_role.py index df9eda150..65fa0138a 100644 --- a/heat/tests/openstack/keystone/test_role.py +++ b/heat/tests/openstack/keystone/test_role.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import resource diff --git a/heat/tests/openstack/keystone/test_role_assignments.py b/heat/tests/openstack/keystone/test_role_assignments.py index a2f235866..116747778 100644 --- a/heat/tests/openstack/keystone/test_role_assignments.py +++ b/heat/tests/openstack/keystone/test_role_assignments.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from heat.common import exception from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks diff --git a/heat/tests/openstack/keystone/test_service.py b/heat/tests/openstack/keystone/test_service.py index ba2a7e0ad..2f773db2a 100644 --- a/heat/tests/openstack/keystone/test_service.py +++ b/heat/tests/openstack/keystone/test_service.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import properties diff --git a/heat/tests/openstack/keystone/test_user.py b/heat/tests/openstack/keystone/test_user.py index 7f67d5c34..6f7dda8f2 100644 --- a/heat/tests/openstack/keystone/test_user.py +++ b/heat/tests/openstack/keystone/test_user.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os.keystone import fake_keystoneclient as fake_ks from heat.engine import resource diff --git a/heat/tests/openstack/magnum/test_bay.py b/heat/tests/openstack/magnum/test_bay.py index f6102728c..66803e80e 100644 --- a/heat/tests/openstack/magnum/test_bay.py +++ b/heat/tests/openstack/magnum/test_bay.py @@ -12,7 +12,8 @@ # under the License. import copy -import mock +from unittest import mock + from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/magnum/test_cluster.py b/heat/tests/openstack/magnum/test_cluster.py index c0c7be829..4bc58aecb 100644 --- a/heat/tests/openstack/magnum/test_cluster.py +++ b/heat/tests/openstack/magnum/test_cluster.py @@ -12,7 +12,8 @@ # under the License. import copy -import mock +from unittest import mock + from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/magnum/test_cluster_template.py b/heat/tests/openstack/magnum/test_cluster_template.py index 7b1fc1e33..22d2aa31c 100644 --- a/heat/tests/openstack/magnum/test_cluster_template.py +++ b/heat/tests/openstack/magnum/test_cluster_template.py @@ -12,7 +12,8 @@ # under the License. import copy -import mock +from unittest import mock + from neutronclient.neutron import v2_0 as neutronV20 from heat.common import exception diff --git a/heat/tests/openstack/manila/test_security_service.py b/heat/tests/openstack/manila/test_security_service.py index fe63d7823..7a4d17c00 100644 --- a/heat/tests/openstack/manila/test_security_service.py +++ b/heat/tests/openstack/manila/test_security_service.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/manila/test_share.py b/heat/tests/openstack/manila/test_share.py index 08c7de679..9c23360a9 100644 --- a/heat/tests/openstack/manila/test_share.py +++ b/heat/tests/openstack/manila/test_share.py @@ -12,8 +12,7 @@ # under the License. import collections import copy - -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/manila/test_share_network.py b/heat/tests/openstack/manila/test_share_network.py index da723b35b..e550137b9 100644 --- a/heat/tests/openstack/manila/test_share_network.py +++ b/heat/tests/openstack/manila/test_share_network.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/manila/test_share_type.py b/heat/tests/openstack/manila/test_share_type.py index cf1032aad..08a79c040 100644 --- a/heat/tests/openstack/manila/test_share_type.py +++ b/heat/tests/openstack/manila/test_share_type.py @@ -12,8 +12,8 @@ # under the License. import copy +from unittest import mock -import mock from heat.common import template_format from heat.engine.resources.openstack.manila import share_type as mshare_type diff --git a/heat/tests/openstack/mistral/test_cron_trigger.py b/heat/tests/openstack/mistral/test_cron_trigger.py index 58c6a15d3..939452f61 100644 --- a/heat/tests/openstack/mistral/test_cron_trigger.py +++ b/heat/tests/openstack/mistral/test_cron_trigger.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/mistral/test_external_resource.py b/heat/tests/openstack/mistral/test_external_resource.py index 77032b817..fd92440a8 100644 --- a/heat/tests/openstack/mistral/test_external_resource.py +++ b/heat/tests/openstack/mistral/test_external_resource.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/mistral/test_workflow.py b/heat/tests/openstack/mistral/test_workflow.py index c311b5f56..9f0057dc9 100644 --- a/heat/tests/openstack/mistral/test_workflow.py +++ b/heat/tests/openstack/mistral/test_workflow.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from mistralclient.api import base as mistral_base diff --git a/heat/tests/openstack/monasca/test_alarm_definition.py b/heat/tests/openstack/monasca/test_alarm_definition.py index f0ea7927c..8dba8d04d 100644 --- a/heat/tests/openstack/monasca/test_alarm_definition.py +++ b/heat/tests/openstack/monasca/test_alarm_definition.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import monasca as client_plugin from heat.engine.resources.openstack.monasca import alarm_definition diff --git a/heat/tests/openstack/monasca/test_notification.py b/heat/tests/openstack/monasca/test_notification.py index 7f2b511ae..500597950 100644 --- a/heat/tests/openstack/monasca/test_notification.py +++ b/heat/tests/openstack/monasca/test_notification.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.engine.cfn import functions as cfn_funcs diff --git a/heat/tests/openstack/neutron/lbaas/test_health_monitor.py b/heat/tests/openstack/neutron/lbaas/test_health_monitor.py index bed3e2b45..4f0fd64a2 100644 --- a/heat/tests/openstack/neutron/lbaas/test_health_monitor.py +++ b/heat/tests/openstack/neutron/lbaas/test_health_monitor.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_l7policy.py b/heat/tests/openstack/neutron/lbaas/test_l7policy.py index 95ab88779..e5b9de155 100644 --- a/heat/tests/openstack/neutron/lbaas/test_l7policy.py +++ b/heat/tests/openstack/neutron/lbaas/test_l7policy.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_l7rule.py b/heat/tests/openstack/neutron/lbaas/test_l7rule.py index 258343ffc..b6103a966 100644 --- a/heat/tests/openstack/neutron/lbaas/test_l7rule.py +++ b/heat/tests/openstack/neutron/lbaas/test_l7rule.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_listener.py b/heat/tests/openstack/neutron/lbaas/test_listener.py index 0b5887e8e..c7aa118fc 100644 --- a/heat/tests/openstack/neutron/lbaas/test_listener.py +++ b/heat/tests/openstack/neutron/lbaas/test_listener.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py b/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py index 24bb7047d..bc38d1aaf 100644 --- a/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py +++ b/heat/tests/openstack/neutron/lbaas/test_loadbalancer.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_pool.py b/heat/tests/openstack/neutron/lbaas/test_pool.py index b71c25bc8..debd5523f 100644 --- a/heat/tests/openstack/neutron/lbaas/test_pool.py +++ b/heat/tests/openstack/neutron/lbaas/test_pool.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/lbaas/test_pool_member.py b/heat/tests/openstack/neutron/lbaas/test_pool_member.py index d6c6c0af3..3138c2527 100644 --- a/heat/tests/openstack/neutron/lbaas/test_pool_member.py +++ b/heat/tests/openstack/neutron/lbaas/test_pool_member.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/test_address_scope.py b/heat/tests/openstack/neutron/test_address_scope.py index 1473501c5..82d7df97c 100644 --- a/heat/tests/openstack/neutron/test_address_scope.py +++ b/heat/tests/openstack/neutron/test_address_scope.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine.clients.os import neutron diff --git a/heat/tests/openstack/neutron/test_extraroute.py b/heat/tests/openstack/neutron/test_extraroute.py index 8ab5ac353..6ef33a0f2 100644 --- a/heat/tests/openstack/neutron/test_extraroute.py +++ b/heat/tests/openstack/neutron/test_extraroute.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_firewall.py b/heat/tests/openstack/neutron/test_neutron_firewall.py index ded9afdf1..b2b288bb9 100644 --- a/heat/tests/openstack/neutron/test_neutron_firewall.py +++ b/heat/tests/openstack/neutron/test_neutron_firewall.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions from neutronclient.v2_0 import client as neutronclient from oslo_config import cfg diff --git a/heat/tests/openstack/neutron/test_neutron_floating_ip.py b/heat/tests/openstack/neutron/test_neutron_floating_ip.py index dc2ebac63..59f54147b 100644 --- a/heat/tests/openstack/neutron/test_neutron_floating_ip.py +++ b/heat/tests/openstack/neutron/test_neutron_floating_ip.py @@ -12,8 +12,8 @@ # under the License. import copy +from unittest import mock -import mock from neutronclient.common import exceptions as qe from neutronclient.neutron import v2_0 as neutronV20 from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_l2_gateway.py b/heat/tests/openstack/neutron/test_neutron_l2_gateway.py index fc64584da..c711bc9d6 100644 --- a/heat/tests/openstack/neutron/test_neutron_l2_gateway.py +++ b/heat/tests/openstack/neutron/test_neutron_l2_gateway.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_l2_gateway_connection.py b/heat/tests/openstack/neutron/test_neutron_l2_gateway_connection.py index b040281d3..6fecffd1b 100644 --- a/heat/tests/openstack/neutron/test_neutron_l2_gateway_connection.py +++ b/heat/tests/openstack/neutron/test_neutron_l2_gateway_connection.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.v2_0 import client as neutronclient from heat.common import template_format diff --git a/heat/tests/openstack/neutron/test_neutron_loadbalancer.py b/heat/tests/openstack/neutron/test_neutron_loadbalancer.py index 4670072f5..388c8056e 100644 --- a/heat/tests/openstack/neutron/test_neutron_loadbalancer.py +++ b/heat/tests/openstack/neutron/test_neutron_loadbalancer.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions from neutronclient.neutron import v2_0 as neutronV20 from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_metering.py b/heat/tests/openstack/neutron/test_neutron_metering.py index 6363e50a6..256da1b81 100644 --- a/heat/tests/openstack/neutron/test_neutron_metering.py +++ b/heat/tests/openstack/neutron/test_neutron_metering.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.common import exceptions from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_network_gateway.py b/heat/tests/openstack/neutron/test_neutron_network_gateway.py index feea90afa..c88387850 100644 --- a/heat/tests/openstack/neutron/test_neutron_network_gateway.py +++ b/heat/tests/openstack/neutron/test_neutron_network_gateway.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from neutronclient.common import exceptions as qe from neutronclient.neutron import v2_0 as neutronV20 diff --git a/heat/tests/openstack/neutron/test_neutron_port.py b/heat/tests/openstack/neutron/test_neutron_port.py index 228273cde..4af5d54e1 100644 --- a/heat/tests/openstack/neutron/test_neutron_port.py +++ b/heat/tests/openstack/neutron/test_neutron_port.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.common import exceptions as qe from neutronclient.neutron import v2_0 as neutronV20 from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_provider_net.py b/heat/tests/openstack/neutron/test_neutron_provider_net.py index 3d95714ed..a528c4d4d 100644 --- a/heat/tests/openstack/neutron/test_neutron_provider_net.py +++ b/heat/tests/openstack/neutron/test_neutron_provider_net.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from neutronclient.common import exceptions as qe from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_rbac_policy.py b/heat/tests/openstack/neutron/test_neutron_rbac_policy.py index 0ee21acf7..765a4caa1 100644 --- a/heat/tests/openstack/neutron/test_neutron_rbac_policy.py +++ b/heat/tests/openstack/neutron/test_neutron_rbac_policy.py @@ -12,7 +12,7 @@ # under the License. -import mock +from unittest import mock import yaml from neutronclient.common import exceptions diff --git a/heat/tests/openstack/neutron/test_neutron_router.py b/heat/tests/openstack/neutron/test_neutron_router.py index 19b1281ac..442668a2b 100644 --- a/heat/tests/openstack/neutron/test_neutron_router.py +++ b/heat/tests/openstack/neutron/test_neutron_router.py @@ -12,8 +12,8 @@ # under the License. import copy +from unittest import mock -import mock from neutronclient.common import exceptions as qe from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_security_group.py b/heat/tests/openstack/neutron/test_neutron_security_group.py index ea269aa22..28a931f51 100644 --- a/heat/tests/openstack/neutron/test_neutron_security_group.py +++ b/heat/tests/openstack/neutron/test_neutron_security_group.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.common import exceptions as neutron_exc from neutronclient.neutron import v2_0 as neutronV20 diff --git a/heat/tests/openstack/neutron/test_neutron_security_group_rule.py b/heat/tests/openstack/neutron/test_neutron_security_group_rule.py index 407f5e9ce..49b427634 100644 --- a/heat/tests/openstack/neutron/test_neutron_security_group_rule.py +++ b/heat/tests/openstack/neutron/test_neutron_security_group_rule.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/neutron/test_neutron_segment.py b/heat/tests/openstack/neutron/test_neutron_segment.py index 4d5a1917b..fa00cf4c9 100644 --- a/heat/tests/openstack/neutron/test_neutron_segment.py +++ b/heat/tests/openstack/neutron/test_neutron_segment.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from neutronclient.neutron import v2_0 as neutronV20 from openstack import exceptions from oslo_utils import excutils diff --git a/heat/tests/openstack/neutron/test_neutron_subnet.py b/heat/tests/openstack/neutron/test_neutron_subnet.py index 1ce9209c4..a90e01230 100644 --- a/heat/tests/openstack/neutron/test_neutron_subnet.py +++ b/heat/tests/openstack/neutron/test_neutron_subnet.py @@ -12,7 +12,8 @@ # under the License. import copy -import mock +from unittest import mock + from neutronclient.common import exceptions as qe from neutronclient.neutron import v2_0 as neutronV20 from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/neutron/test_neutron_vpnservice.py b/heat/tests/openstack/neutron/test_neutron_vpnservice.py index aa28c58f3..003d5bdd6 100644 --- a/heat/tests/openstack/neutron/test_neutron_vpnservice.py +++ b/heat/tests/openstack/neutron/test_neutron_vpnservice.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from neutronclient.common import exceptions from neutronclient.neutron import v2_0 as neutronV20 diff --git a/heat/tests/openstack/neutron/test_qos.py b/heat/tests/openstack/neutron/test_qos.py index b490638f5..d46eb64f4 100644 --- a/heat/tests/openstack/neutron/test_qos.py +++ b/heat/tests/openstack/neutron/test_qos.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine.clients.os import neutron diff --git a/heat/tests/openstack/neutron/test_quota.py b/heat/tests/openstack/neutron/test_quota.py index e2765ee03..4cf73ebfa 100644 --- a/heat/tests/openstack/neutron/test_quota.py +++ b/heat/tests/openstack/neutron/test_quota.py @@ -10,7 +10,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py b/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py index 5f5113c77..c4a0fd4e5 100644 --- a/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py +++ b/heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.resources.openstack.neutron.sfc import flow_classifier from heat.engine import stack diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_chain.py b/heat/tests/openstack/neutron/test_sfc/test_port_chain.py index bfa073cba..233bb1549 100644 --- a/heat/tests/openstack/neutron/test_sfc/test_port_chain.py +++ b/heat/tests/openstack/neutron/test_sfc/test_port_chain.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import neutron from heat.engine.resources.openstack.neutron.sfc import port_chain diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_pair.py b/heat/tests/openstack/neutron/test_sfc/test_port_pair.py index 5bb9c7003..bb4fbf856 100644 --- a/heat/tests/openstack/neutron/test_sfc/test_port_pair.py +++ b/heat/tests/openstack/neutron/test_sfc/test_port_pair.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.resources.openstack.neutron.sfc import port_pair from heat.engine import stack diff --git a/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py b/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py index c1d73e228..0b150aec8 100644 --- a/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py +++ b/heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import neutron from heat.engine.resources.openstack.neutron.sfc import port_pair_group diff --git a/heat/tests/openstack/neutron/test_taas/test_tap_flow.py b/heat/tests/openstack/neutron/test_taas/test_tap_flow.py index 7cf0095c4..ffff2fa59 100644 --- a/heat/tests/openstack/neutron/test_taas/test_tap_flow.py +++ b/heat/tests/openstack/neutron/test_taas/test_tap_flow.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.resources.openstack.neutron.taas import tap_flow from heat.engine import stack diff --git a/heat/tests/openstack/neutron/test_taas/test_tap_service.py b/heat/tests/openstack/neutron/test_taas/test_tap_service.py index 03fb3e5cf..322c910b6 100644 --- a/heat/tests/openstack/neutron/test_taas/test_tap_service.py +++ b/heat/tests/openstack/neutron/test_taas/test_tap_service.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.resources.openstack.neutron.taas import tap_service from heat.engine import stack diff --git a/heat/tests/openstack/nova/fakes.py b/heat/tests/openstack/nova/fakes.py index 17628a985..115a9910e 100644 --- a/heat/tests/openstack/nova/fakes.py +++ b/heat/tests/openstack/nova/fakes.py @@ -14,7 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from novaclient import client as base_client from novaclient import exceptions as nova_exceptions import requests @@ -22,7 +23,6 @@ from urllib import parse as urlparse from heat.tests import fakes - NOVA_API_VERSION = "2.1" Client = base_client.Client(NOVA_API_VERSION).__class__ diff --git a/heat/tests/openstack/nova/test_flavor.py b/heat/tests/openstack/nova/test_flavor.py index 1f6afcfdf..ffb8334da 100644 --- a/heat/tests/openstack/nova/test_flavor.py +++ b/heat/tests/openstack/nova/test_flavor.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine import stack from heat.engine import template diff --git a/heat/tests/openstack/nova/test_floatingip.py b/heat/tests/openstack/nova/test_floatingip.py index afbdde024..e747ce224 100644 --- a/heat/tests/openstack/nova/test_floatingip.py +++ b/heat/tests/openstack/nova/test_floatingip.py @@ -12,8 +12,8 @@ # under the License. import copy +from unittest import mock -import mock from neutronclient.v2_0 import client as neutronclient from heat.common import exception as heat_ex diff --git a/heat/tests/openstack/nova/test_host_aggregate.py b/heat/tests/openstack/nova/test_host_aggregate.py index 676f5e5c4..bb0fbd944 100644 --- a/heat/tests/openstack/nova/test_host_aggregate.py +++ b/heat/tests/openstack/nova/test_host_aggregate.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.engine.clients.os import nova from heat.engine import stack diff --git a/heat/tests/openstack/nova/test_keypair.py b/heat/tests/openstack/nova/test_keypair.py index 4c2a3c7ec..c746b0950 100644 --- a/heat/tests/openstack/nova/test_keypair.py +++ b/heat/tests/openstack/nova/test_keypair.py @@ -12,8 +12,7 @@ # under the License. import copy - -import mock +from unittest import mock from heat.common import exception from heat.engine.clients.os import keystone diff --git a/heat/tests/openstack/nova/test_quota.py b/heat/tests/openstack/nova/test_quota.py index 2c275904e..bd2beb8f7 100644 --- a/heat/tests/openstack/nova/test_quota.py +++ b/heat/tests/openstack/nova/test_quota.py @@ -10,7 +10,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/nova/test_server.py b/heat/tests/openstack/nova/test_server.py index e90d5f4f9..6f841165d 100644 --- a/heat/tests/openstack/nova/test_server.py +++ b/heat/tests/openstack/nova/test_server.py @@ -14,7 +14,7 @@ import collections import contextlib import copy -import mock +from unittest import mock from keystoneauth1 import exceptions as ks_exceptions from neutronclient.v2_0 import client as neutronclient diff --git a/heat/tests/openstack/nova/test_server_group.py b/heat/tests/openstack/nova/test_server_group.py index 6a2e8bed5..0a1e682e0 100644 --- a/heat/tests/openstack/nova/test_server_group.py +++ b/heat/tests/openstack/nova/test_server_group.py @@ -12,8 +12,7 @@ # under the License. import json - -import mock +from unittest import mock from heat.common import template_format from heat.engine import scheduler diff --git a/heat/tests/openstack/octavia/test_flavor.py b/heat/tests/openstack/octavia/test_flavor.py index 556b9d31f..3d5b9537d 100644 --- a/heat/tests/openstack/octavia/test_flavor.py +++ b/heat/tests/openstack/octavia/test_flavor.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import template_format from heat.tests import common diff --git a/heat/tests/openstack/octavia/test_flavor_profile.py b/heat/tests/openstack/octavia/test_flavor_profile.py index 0452e9639..4c0646a33 100644 --- a/heat/tests/openstack/octavia/test_flavor_profile.py +++ b/heat/tests/openstack/octavia/test_flavor_profile.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import template_format from heat.tests import common diff --git a/heat/tests/openstack/octavia/test_health_monitor.py b/heat/tests/openstack/octavia/test_health_monitor.py index 880473881..bbc4c3e18 100644 --- a/heat/tests/openstack/octavia/test_health_monitor.py +++ b/heat/tests/openstack/octavia/test_health_monitor.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_l7policy.py b/heat/tests/openstack/octavia/test_l7policy.py index c66eff043..0628a94e5 100644 --- a/heat/tests/openstack/octavia/test_l7policy.py +++ b/heat/tests/openstack/octavia/test_l7policy.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_l7rule.py b/heat/tests/openstack/octavia/test_l7rule.py index 2d46d6fca..e5d1eb6b4 100644 --- a/heat/tests/openstack/octavia/test_l7rule.py +++ b/heat/tests/openstack/octavia/test_l7rule.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_listener.py b/heat/tests/openstack/octavia/test_listener.py index a126ec98a..bfafe29b1 100644 --- a/heat/tests/openstack/octavia/test_listener.py +++ b/heat/tests/openstack/octavia/test_listener.py @@ -12,7 +12,7 @@ # under the License. -import mock +from unittest import mock import yaml from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_loadbalancer.py b/heat/tests/openstack/octavia/test_loadbalancer.py index 56e527ab0..a93dda3f4 100644 --- a/heat/tests/openstack/octavia/test_loadbalancer.py +++ b/heat/tests/openstack/octavia/test_loadbalancer.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.neutron import v2_0 as neutronV20 from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_pool.py b/heat/tests/openstack/octavia/test_pool.py index 34b3e31e8..1192d53d7 100644 --- a/heat/tests/openstack/octavia/test_pool.py +++ b/heat/tests/openstack/octavia/test_pool.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock import yaml from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_pool_member.py b/heat/tests/openstack/octavia/test_pool_member.py index a75b3e808..07ce9f075 100644 --- a/heat/tests/openstack/octavia/test_pool_member.py +++ b/heat/tests/openstack/octavia/test_pool_member.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from neutronclient.neutron import v2_0 as neutronV20 from osc_lib import exceptions diff --git a/heat/tests/openstack/octavia/test_quota.py b/heat/tests/openstack/octavia/test_quota.py index 5d440c88d..390ff3083 100644 --- a/heat/tests/openstack/octavia/test_quota.py +++ b/heat/tests/openstack/octavia/test_quota.py @@ -10,7 +10,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six from heat.common import exception diff --git a/heat/tests/openstack/sahara/test_cluster.py b/heat/tests/openstack/sahara/test_cluster.py index 221dbf630..d137984e9 100644 --- a/heat/tests/openstack/sahara/test_cluster.py +++ b/heat/tests/openstack/sahara/test_cluster.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/sahara/test_data_source.py b/heat/tests/openstack/sahara/test_data_source.py index b563dbd9b..3417ee706 100644 --- a/heat/tests/openstack/sahara/test_data_source.py +++ b/heat/tests/openstack/sahara/test_data_source.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/sahara/test_image.py b/heat/tests/openstack/sahara/test_image.py index 5da7a17eb..a7b00d896 100644 --- a/heat/tests/openstack/sahara/test_image.py +++ b/heat/tests/openstack/sahara/test_image.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine.clients.os import glance diff --git a/heat/tests/openstack/sahara/test_job.py b/heat/tests/openstack/sahara/test_job.py index 0566b8f45..4d8234b18 100644 --- a/heat/tests/openstack/sahara/test_job.py +++ b/heat/tests/openstack/sahara/test_job.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine.clients.os import sahara diff --git a/heat/tests/openstack/sahara/test_job_binary.py b/heat/tests/openstack/sahara/test_job_binary.py index 12d54d67a..ed9ba8142 100644 --- a/heat/tests/openstack/sahara/test_job_binary.py +++ b/heat/tests/openstack/sahara/test_job_binary.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/sahara/test_templates.py b/heat/tests/openstack/sahara/test_templates.py index 2a43bde63..774e52fb7 100644 --- a/heat/tests/openstack/sahara/test_templates.py +++ b/heat/tests/openstack/sahara/test_templates.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/senlin/test_cluster.py b/heat/tests/openstack/senlin/test_cluster.py index 38a89c160..32b39fb54 100644 --- a/heat/tests/openstack/senlin/test_cluster.py +++ b/heat/tests/openstack/senlin/test_cluster.py @@ -14,7 +14,8 @@ # limitations under the License. import copy -import mock +from unittest import mock + from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/senlin/test_node.py b/heat/tests/openstack/senlin/test_node.py index 9ba233d01..108d737ea 100644 --- a/heat/tests/openstack/senlin/test_node.py +++ b/heat/tests/openstack/senlin/test_node.py @@ -13,7 +13,8 @@ # limitations under the License. import copy -import mock +from unittest import mock + from oslo_config import cfg from heat.common import exception diff --git a/heat/tests/openstack/senlin/test_policy.py b/heat/tests/openstack/senlin/test_policy.py index 05e005313..5763cc561 100644 --- a/heat/tests/openstack/senlin/test_policy.py +++ b/heat/tests/openstack/senlin/test_policy.py @@ -13,7 +13,7 @@ # limitations under the License. import copy -import mock +from unittest import mock from openstack.clustering.v1._proxy import Proxy from openstack import exceptions diff --git a/heat/tests/openstack/senlin/test_profile.py b/heat/tests/openstack/senlin/test_profile.py index 2a0001a9d..c3eb6b869 100644 --- a/heat/tests/openstack/senlin/test_profile.py +++ b/heat/tests/openstack/senlin/test_profile.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from heat.common import template_format from heat.engine.clients.os import senlin diff --git a/heat/tests/openstack/senlin/test_receiver.py b/heat/tests/openstack/senlin/test_receiver.py index 138de4c6b..5685424b2 100644 --- a/heat/tests/openstack/senlin/test_receiver.py +++ b/heat/tests/openstack/senlin/test_receiver.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from openstack import exceptions diff --git a/heat/tests/openstack/swift/test_container.py b/heat/tests/openstack/swift/test_container.py index deeb4dae3..82f05b13a 100644 --- a/heat/tests/openstack/swift/test_container.py +++ b/heat/tests/openstack/swift/test_container.py @@ -11,8 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock -import mock import swiftclient.client as sc from heat.common import exception diff --git a/heat/tests/openstack/trove/test_cluster.py b/heat/tests/openstack/trove/test_cluster.py index b3cb0b382..e2e32c1ed 100644 --- a/heat/tests/openstack/trove/test_cluster.py +++ b/heat/tests/openstack/trove/test_cluster.py @@ -12,7 +12,8 @@ # under the License. import copy -import mock +from unittest import mock + from troveclient import exceptions as troveexc from heat.common import exception diff --git a/heat/tests/openstack/trove/test_instance.py b/heat/tests/openstack/trove/test_instance.py index c1ac2aac2..bc4d024d2 100644 --- a/heat/tests/openstack/trove/test_instance.py +++ b/heat/tests/openstack/trove/test_instance.py @@ -11,9 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from unittest import mock import uuid -import mock from oslo_config import cfg from troveclient import exceptions as troveexc from troveclient.v1 import users diff --git a/heat/tests/openstack/zaqar/test_queue.py b/heat/tests/openstack/zaqar/test_queue.py index e3c45e744..c12d1abbd 100644 --- a/heat/tests/openstack/zaqar/test_queue.py +++ b/heat/tests/openstack/zaqar/test_queue.py @@ -11,8 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock - +from unittest import mock from urllib import parse as urlparse from heat.common import template_format diff --git a/heat/tests/openstack/zaqar/test_subscription.py b/heat/tests/openstack/zaqar/test_subscription.py index 214ce9bb3..436db0cab 100644 --- a/heat/tests/openstack/zaqar/test_subscription.py +++ b/heat/tests/openstack/zaqar/test_subscription.py @@ -11,7 +11,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from heat.common import exception from heat.common import template_format diff --git a/heat/tests/openstack/zun/test_container.py b/heat/tests/openstack/zun/test_container.py index 683a888c4..f69f995f1 100644 --- a/heat/tests/openstack/zun/test_container.py +++ b/heat/tests/openstack/zun/test_container.py @@ -12,7 +12,7 @@ # under the License. import copy -import mock +from unittest import mock from oslo_config import cfg from zunclient import exceptions as zc_exc |