openstack
/
heat
Code Issues Proposed changes

Merge "Remove six and python 2.7 full support"

This commit is contained in:
Zuul 2020-05-03 05:58:18 +00:00 committed by Gerrit Code Review
parent 9e0959171a 91e50206f8
commit b96904740f
10 changed files with 56 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
heat/tests/openstack/neutron/test_neutron_loadbalancer.py
View File

@ -16,7 +16,6 @@ from neutronclient.common import exceptions
from neutronclient.neutron import v2_0 as neutronV20
from neutronclient.v2_0 import client as neutronclient
from oslo_config import cfg
import six
from heat.common import exception
from heat.common.i18n import _
@ -212,7 +211,7 @@ class HealthMonitorTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.monitor: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mock_create.assert_called_once_with(self.create_snippet)
@ -247,7 +246,7 @@ class HealthMonitorTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.monitor: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mock_create.assert_called_once_with(self.create_snippet)
self.mock_delete.assert_called_once_with('5678')
@ -269,7 +268,7 @@ class HealthMonitorTest(common.HeatTestCase):
rsrc.FnGetAtt, 'subnet_id')
self.assertEqual(
'The Referenced Attribute (monitor subnet_id) is incorrect.',
six.text_type(error))
str(error))
self.mock_create.assert_called_once_with(self.create_snippet)
def test_update(self):
@ -423,7 +422,7 @@ class PoolTest(common.HeatTestCase):
self.assertEqual(
'ResourceInError: resources.pool: '
'Went to status ERROR due to "error in pool"',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mock_create.assert_called_once_with(pool_create_snippet)
self.mock_create_vip.assert_called_once_with(vip_create_snippet)
@ -457,7 +456,7 @@ class PoolTest(common.HeatTestCase):
self.assertEqual('ResourceUnknownStatus: resources.pool: '
'Pool creation failed due to '
'vip - Unknown status SOMETHING due to "Unknown"',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mock_create.assert_called_once_with(pool_create_snippet)
self.mock_create_vip.assert_called_once_with(vip_create_snippet)
@ -482,7 +481,7 @@ class PoolTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.pool: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mock_create.assert_called_once_with(pool_create_snippet)
@ -571,7 +570,7 @@ class PoolTest(common.HeatTestCase):
error = self.assertRaises(exception.StackValidationFailed,
resource.validate)
self.assertEqual(msg, six.text_type(error))
self.assertEqual(msg, str(error))
def test_validation_not_failing_without_session_persistence(self):
snippet = template_format.parse(pool_template)
@ -670,7 +669,7 @@ class PoolTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.pool: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mock_delete_vip.assert_called_once_with('xyz')
self.mock_delete.assert_not_called()
@ -688,7 +687,7 @@ class PoolTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.pool: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mock_delete.assert_called_once_with('5678')
self.mock_delete_vip.assert_called_once_with('xyz')
@ -716,7 +715,7 @@ class PoolTest(common.HeatTestCase):
rsrc.FnGetAtt, 'net_id')
self.assertEqual(
'The Referenced Attribute (pool net_id) is incorrect.',
six.text_type(error))
str(error))
def test_update(self):
rsrc = self.create_pool()

9
heat/tests/openstack/neutron/test_neutron_metering.py
View File

@ -12,7 +12,6 @@
# under the License.
import mock
import six
from neutronclient.common import exceptions
from neutronclient.v2_0 import client as neutronclient
@ -91,7 +90,7 @@ class MeteringLabelTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.label: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_metering_label.assert_called_once_with({
@ -152,7 +151,7 @@ class MeteringLabelTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.label: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_metering_label.assert_called_once_with({
@ -241,7 +240,7 @@ class MeteringRuleTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.rule: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_metering_label_rule.assert_called_once_with({
@ -308,7 +307,7 @@ class MeteringRuleTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.rule: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_metering_label_rule.assert_called_once_with({

9
heat/tests/openstack/neutron/test_neutron_network_gateway.py
View File

@ -15,7 +15,6 @@
# limitations under the License.
import mock
import six
from neutronclient.common import exceptions as qe
from neutronclient.neutron import v2_0 as neutronV20
@ -472,7 +471,7 @@ class NeutronNetworkGatewayTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.network_gateway: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.assertIsNone(scheduler.TaskRunner(rsrc.delete)())
self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state)
@ -502,7 +501,7 @@ class NeutronNetworkGatewayTest(common.HeatTestCase):
self.assertEqual(
'segmentation_id must be specified for using vlan',
six.text_type(error))
str(error))
def test_gateway_validate_failed_with_flat(self):
t = template_format.parse(gw_template)
@ -520,7 +519,7 @@ class NeutronNetworkGatewayTest(common.HeatTestCase):
self.assertEqual(
'segmentation_id cannot be specified except 0 for using flat',
six.text_type(error))
str(error))
def test_network_gateway_attribute(self):
rsrc = self.prepare_create_network_gateway()
@ -535,7 +534,7 @@ class NeutronNetworkGatewayTest(common.HeatTestCase):
rsrc.FnGetAtt, 'hoge')
self.assertEqual(
'The Referenced Attribute (test_network_gateway hoge) is '
'incorrect.', six.text_type(error))
'incorrect.', str(error))
self.mockclient.create_network_gateway.assert_called_once_with({
'network_gateway': {

3
heat/tests/openstack/neutron/test_neutron_port.py
View File

@ -16,7 +16,6 @@ from neutronclient.common import exceptions as qe
from neutronclient.neutron import v2_0 as neutronV20
from neutronclient.v2_0 import client as neutronclient
from oslo_serialization import jsonutils
import six
from heat.common import exception
from heat.common import template_format
@ -1078,7 +1077,7 @@ class UpdatePortTest(common.HeatTestCase):
value_specs = update_dict.pop('value_specs')
if value_specs:
for value_spec in six.iteritems(value_specs):
for value_spec in value_specs.items():
update_dict[value_spec[0]] = value_spec[1]
tags = update_dict.pop('tags')

13
heat/tests/openstack/neutron/test_neutron_router.py
View File

@ -16,7 +16,6 @@ import copy
import mock
from neutronclient.common import exceptions as qe
from neutronclient.v2_0 import client as neutronclient
import six
from heat.common import exception
from heat.common import template_format
@ -201,7 +200,7 @@ class NeutronRouterTest(common.HeatTestCase):
exc = self.assertRaises(exception.ResourcePropertyConflict,
rsrc.validate)
self.assertIn('distributed, l3_agent_id/l3_agent_ids',
six.text_type(exc))
str(exc))
# test distributed can not specify l3_agent_ids
props['l3_agent_ids'] = ['id1', 'id2']
stack = utils.parse_stack(t)
@ -209,7 +208,7 @@ class NeutronRouterTest(common.HeatTestCase):
exc = self.assertRaises(exception.ResourcePropertyConflict,
rsrc.validate)
self.assertIn('distributed, l3_agent_id/l3_agent_ids',
six.text_type(exc))
str(exc))
def test_router_validate_l3_agents(self):
t = template_format.parse(neutron_template)
@ -222,7 +221,7 @@ class NeutronRouterTest(common.HeatTestCase):
exc = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertIn('Non HA routers can only have one L3 agent',
six.text_type(exc))
str(exc))
self.assertIsNone(rsrc.properties.get(rsrc.L3_AGENT_ID))
def test_router_validate_ha_distribute(self):
@ -240,7 +239,7 @@ class NeutronRouterTest(common.HeatTestCase):
rsrc.reparse()
exc = self.assertRaises(exception.ResourcePropertyConflict,
rsrc.validate)
self.assertIn('distributed, ha', six.text_type(exc))
self.assertIn('distributed, ha', str(exc))
def test_router_validate_ha_l3_agents(self):
t = template_format.parse(neutron_template)
@ -253,7 +252,7 @@ class NeutronRouterTest(common.HeatTestCase):
exc = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertIn('Non HA routers can only have one L3 agent.',
six.text_type(exc))
str(exc))
def test_router(self):
t = template_format.parse(neutron_template)
@ -609,7 +608,7 @@ class NeutronRouterTest(common.HeatTestCase):
res.validate)
self.assertEqual("At least one of the following properties "
"must be specified: subnet, port.",
six.text_type(ex))
str(ex))
def test_gateway_router(self):
def find_rsrc(resource, name_or_id, cmd_resource=None):

9
heat/tests/openstack/neutron/test_neutron_segment.py
View File

@ -15,7 +15,6 @@ import mock
from neutronclient.neutron import v2_0 as neutronV20
from openstack import exceptions
from oslo_utils import excutils
import six
from heat.common import exception
from heat.common import template_format
@ -141,7 +140,7 @@ class NeutronSegmentTest(common.HeatTestCase):
errMsg = 'physical_network is required for vlan provider network.'
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMsg, six.text_type(error))
self.assertEqual(errMsg, str(error))
props['physical_network'] = 'physnet'
props['segmentation_id'] = '4095'
@ -151,7 +150,7 @@ class NeutronSegmentTest(common.HeatTestCase):
'on each physical_network.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMsg, six.text_type(error))
self.assertEqual(errMsg, str(error))
def test_validate_flat_type(self):
self.t = template_format.parse(inline_templates.SEGMENT_TEMPLATE)
@ -163,7 +162,7 @@ class NeutronSegmentTest(common.HeatTestCase):
errMsg = ('segmentation_id is prohibited for flat provider network.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMsg, six.text_type(error))
self.assertEqual(errMsg, str(error))
def test_validate_tunnel_type(self):
self.t = template_format.parse(inline_templates.SEGMENT_TEMPLATE)
@ -175,7 +174,7 @@ class NeutronSegmentTest(common.HeatTestCase):
errMsg = ('physical_network is prohibited for vxlan provider network.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMsg, six.text_type(error))
self.assertEqual(errMsg, str(error))
def test_segment_get_attr(self):
segment_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'

15
heat/tests/openstack/neutron/test_neutron_subnet.py
View File

@ -16,7 +16,6 @@ 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
import six
from heat.common import exception
from heat.common import template_format
@ -553,7 +552,7 @@ class NeutronSubnetTest(common.HeatTestCase):
"resources.sub_net.properties.host_routes[0].destination: "
"Error validating value 'invalid_cidr': Invalid net cidr "
"invalid IPNetwork invalid_cidr ")
self.assertEqual(msg, six.text_type(ex))
self.assertEqual(msg, str(ex))
def test_ipv6_validate_ra_mode(self):
t = template_format.parse(neutron_template)
@ -568,7 +567,7 @@ class NeutronSubnetTest(common.HeatTestCase):
ex = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual("When both ipv6_ra_mode and ipv6_address_mode are "
"set, they must be equal.", six.text_type(ex))
"set, they must be equal.", str(ex))
def test_ipv6_validate_ip_version(self):
t = template_format.parse(neutron_template)
@ -583,7 +582,7 @@ class NeutronSubnetTest(common.HeatTestCase):
ex = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual("ipv6_ra_mode and ipv6_address_mode are not "
"supported for ipv4.", six.text_type(ex))
"supported for ipv4.", str(ex))
def test_validate_both_subnetpool_cidr(self):
self.patchobject(neutronV20, 'find_resourceid_by_name_or_id',
@ -600,7 +599,7 @@ class NeutronSubnetTest(common.HeatTestCase):
rsrc.validate)
msg = ("Cannot define the following properties at the same time: "
"subnetpool, cidr.")
self.assertEqual(msg, six.text_type(ex))
self.assertEqual(msg, str(ex))
def test_validate_none_subnetpool_cidr(self):
t = template_format.parse(neutron_template)
@ -614,7 +613,7 @@ class NeutronSubnetTest(common.HeatTestCase):
rsrc.validate)
msg = ("At least one of the following properties must be specified: "
"subnetpool, cidr.")
self.assertEqual(msg, six.text_type(ex))
self.assertEqual(msg, str(ex))
def test_validate_subnetpool_ref_with_cidr(self):
t = template_format.parse(neutron_template)
@ -635,7 +634,7 @@ class NeutronSubnetTest(common.HeatTestCase):
rsrc.validate)
msg = ("Cannot define the following properties at the same time: "
"subnetpool, cidr.")
self.assertEqual(msg, six.text_type(ex))
self.assertEqual(msg, str(ex))
def test_validate_subnetpool_ref_no_cidr(self):
t = template_format.parse(neutron_template)
@ -667,7 +666,7 @@ class NeutronSubnetTest(common.HeatTestCase):
rsrc.validate)
msg = ("Cannot define the following properties at the same time: "
"prefixlen, cidr.")
self.assertEqual(msg, six.text_type(ex))
self.assertEqual(msg, str(ex))
def test_deprecated_network_id(self):
template = """

11
heat/tests/openstack/neutron/test_neutron_subnetpool.py
View File

@ -14,7 +14,6 @@
from neutronclient.common import exceptions as qe
from neutronclient.neutron import v2_0 as neutronV20
from neutronclient.v2_0 import client as neutronclient
import six
from heat.common import exception
from heat.common import template_format
@ -54,7 +53,7 @@ class NeutronSubnetPoolTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.sub_pool: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
else:
self.patchobject(neutronclient.Client, 'create_subnetpool',
return_value={'subnetpool': {
@ -80,7 +79,7 @@ class NeutronSubnetPoolTest(common.HeatTestCase):
'min_prefixlen=28.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMessage, six.text_type(error))
self.assertEqual(errMessage, str(error))
def test_validate_prefixlen_default_gt_max(self):
self.t = template_format.parse(inline_templates.SPOOL_TEMPLATE)
@ -93,7 +92,7 @@ class NeutronSubnetPoolTest(common.HeatTestCase):
'default_prefixlen=28.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMessage, six.text_type(error))
self.assertEqual(errMessage, str(error))
def test_validate_prefixlen_min_gt_default(self):
self.t = template_format.parse(inline_templates.SPOOL_TEMPLATE)
@ -106,7 +105,7 @@ class NeutronSubnetPoolTest(common.HeatTestCase):
'default_prefixlen=24.')
error = self.assertRaises(exception.StackValidationFailed,
rsrc.validate)
self.assertEqual(errMessage, six.text_type(error))
self.assertEqual(errMessage, str(error))
def test_validate_minimal(self):
self.t = template_format.parse(inline_templates.SPOOL_MINIMAL_TEMPLATE)
@ -235,7 +234,7 @@ class NeutronSubnetPoolTest(common.HeatTestCase):
rsrc.handle_update,
update_snippet, {}, props)
self.assertEqual(errMessage, six.text_type(error))
self.assertEqual(errMessage, str(error))
update_subnetpool.assert_not_called()
props = {

3
heat/tests/openstack/neutron/test_neutron_trunk.py
View File

@ -13,7 +13,6 @@
# under the License.
import copy
import six
from oslo_log import log as logging
@ -261,7 +260,7 @@ class NeutronTrunkTest(common.HeatTestCase):
self.assertIn(
'Went to status DEGRADED due to',
six.text_type(e))
str(e))
def test_create_parent_port_by_name(self):
t = template_format.parse(create_template)

29
heat/tests/openstack/neutron/test_neutron_vpnservice.py
View File

@ -13,7 +13,6 @@
import copy
import mock
import six
from neutronclient.common import exceptions
from neutronclient.neutron import v2_0 as neutronV20
@ -197,7 +196,7 @@ class VPNServiceTest(common.HeatTestCase):
self.assertEqual(
'ResourceInError: resources.vpnservice: '
'Went to status ERROR due to "Error in VPNService"',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_vpnservice.assert_called_once_with(
@ -221,7 +220,7 @@ class VPNServiceTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.vpnservice: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_vpnservice.assert_called_once_with(
@ -278,7 +277,7 @@ class VPNServiceTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.vpnservice: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_vpnservice.assert_called_once_with(
@ -319,7 +318,7 @@ class VPNServiceTest(common.HeatTestCase):
self.assertEqual(
'The Referenced Attribute (vpnservice non-existent_property) is '
'incorrect.',
six.text_type(error))
str(error))
self.mockclient.create_vpnservice.assert_called_once_with(
self.VPN_SERVICE_CONF)
@ -426,7 +425,7 @@ class IPsecSiteConnectionTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ipsec_site_connection: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ipsec_site_connection.assert_called_once_with(
@ -445,7 +444,7 @@ class IPsecSiteConnectionTest(common.HeatTestCase):
self.assertEqual(
'ResourceInError: resources.ipsec_site_connection: '
'Went to status ERROR due to "Error in IPsecSiteConnection"',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ipsec_site_connection.assert_called_once_with(
@ -505,7 +504,7 @@ class IPsecSiteConnectionTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ipsec_site_connection: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ipsec_site_connection.assert_called_once_with(
@ -556,7 +555,7 @@ class IPsecSiteConnectionTest(common.HeatTestCase):
self.assertEqual(
'The Referenced Attribute (ipsec_site_connection '
'non-existent_property) is incorrect.',
six.text_type(error))
str(error))
self.mockclient.create_ipsec_site_connection.assert_called_once_with(
self.IPSEC_SITE_CONNECTION_CONF)
@ -645,7 +644,7 @@ class IKEPolicyTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ikepolicy: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ikepolicy.assert_called_once_with(
@ -691,7 +690,7 @@ class IKEPolicyTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ikepolicy: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ikepolicy.assert_called_once_with(
@ -727,7 +726,7 @@ class IKEPolicyTest(common.HeatTestCase):
self.assertEqual(
'The Referenced Attribute (ikepolicy non-existent_property) is '
'incorrect.',
six.text_type(error))
str(error))
self.mockclient.create_ikepolicy.assert_called_once_with(
self.IKE_POLICY_CONF)
@ -827,7 +826,7 @@ class IPsecPolicyTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ipsecpolicy: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ipsecpolicy.assert_called_once_with(
@ -873,7 +872,7 @@ class IPsecPolicyTest(common.HeatTestCase):
self.assertEqual(
'NeutronClientException: resources.ipsecpolicy: '
'An unknown exception occurred.',
six.text_type(error))
str(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.mockclient.create_ipsecpolicy.assert_called_once_with(
@ -909,7 +908,7 @@ class IPsecPolicyTest(common.HeatTestCase):
self.assertEqual(
'The Referenced Attribute (ipsecpolicy non-existent_property) is '
'incorrect.',
six.text_type(error))
str(error))
self.mockclient.create_ipsecpolicy.assert_called_once_with(
self.IPSEC_POLICY_CONF)