openstack
/
tacker
Code Issues Proposed changes

Update hacking for Python3 

The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found by updated hacking version.

Update local hacking checks for new flake8.

Remove hacking and friends from lower-constraints, they are not
needed in installations.

Change-Id: If787d610315be6c973b4335e047242c3aa3caf2a
This commit is contained in:
Andreas Jaeger 2020-04-01 20:15:00 +02:00
parent d98c484e70
commit 4a2fd6c292
74 changed files with 227 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lower-constraints.txt
View File

@ -30,13 +30,11 @@ eventlet==0.22.0
extras==1.0.0
fasteners==0.14.1
fixtures==3.0.0
flake8==2.5.5
future==0.16.0
futurist==1.6.0
glance-store==0.26.1
google-auth==1.4.1
greenlet==0.4.13
hacking==0.12.0
heat-translator==2.0.0
idna==2.6
imagesize==1.0.0
@ -92,7 +90,6 @@ paramiko==2.0.0
Paste==2.0.2
PasteDeploy==1.5.0
pbr==2.0.0
pep8==1.5.7
pkg-resources==0.0.0
prettytable==0.7.2
psutil==5.4.3
@ -100,7 +97,6 @@ pyasn1-modules==0.2.1
pyasn1==0.4.2
pycadf==2.7.0
pycparser==2.18
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
PyNaCl==1.2.1

4
tacker/api/v1/attributes.py
View File

@ -545,8 +545,8 @@ def convert_to_list(data):
return [data]
HOSTNAME_PATTERN = ("(?=^.{1,254}$)(^(?:(?!\d+\.|-)[a-zA-Z0-9_\-]"
"{1,63}(?<!-)\.?)+(?:[a-zA-Z]{2,})$)")
HOSTNAME_PATTERN = (r"(?=^.{1,254}$)(^(?:(?!\d+\.|-)[a-zA-Z0-9_\-]"
r"{1,63}(?<!-)\.?)+(?:[a-zA-Z]{2,})$)")
HEX_ELEM = '[0-9A-Fa-f]'
UUID_PATTERN = '-'.join([HEX_ELEM + '{8}', HEX_ELEM + '{4}',

7
tacker/api/v1/base.py
View File

@ -511,7 +511,7 @@ class Controller(object):
LOG.debug("Request body: %(body)s",
{'body': strutils.mask_password(body)})
prep_req_body = lambda x: Controller.prepare_request_body(
prep_req_body = lambda x: Controller.prepare_request_body( # noqa
context,
x if resource in x else {resource: x},
is_create,
@ -572,8 +572,9 @@ class Controller(object):
and (attr == "vnfd_id") and is_create:
continue
# skip validating vnffgd_id when vnffgd_template is provided
if (resource == 'vnffg') and ('vnffgd_template' in body['vnffg'])\
and (attr == 'vnffgd_id') and is_create:
if ((resource == 'vnffg')
and ('vnffgd_template' in body['vnffg'])
and (attr == 'vnffgd_id') and is_create):
continue
# skip validating nsd_id when nsd_template is provided
if (resource == 'ns') and ('nsd_template' in body['ns'])\

2
tacker/common/config.py
View File

@ -76,6 +76,7 @@ cfg.CONF.register_cli_opts(core_cli_opts)
def config_opts():
return [(None, core_opts), (None, core_cli_opts)]
# Ensure that the control exchange is set correctly
oslo_messaging.set_transport_defaults(control_exchange='tacker')
@ -89,6 +90,7 @@ def set_db_defaults():
max_pool_size=10,
max_overflow=20, pool_timeout=10)
set_db_defaults()

4
tacker/common/utils.py
View File

@ -94,7 +94,7 @@ def find_config_file(options, config_file):
* Search for the configuration files via common cfg directories
:retval Full path to config file, or None if no config file found
"""
fix_path = lambda p: os.path.abspath(os.path.expanduser(p))
fix_path = lambda p: os.path.abspath(os.path.expanduser(p)) # noqa: E731
if options.get('config_file'):
if os.path.exists(options['config_file']):
return fix_path(options['config_file'])
@ -568,7 +568,7 @@ class MemoryUnit(object):
unit = MemoryUnit.UNIT_SIZE_DEFAULT
LOG.info(_('A memory unit is not provided for size; using the '
'default unit %(default)s.') % {'default': 'B'})
regex = re.compile('(\d*)\s*(\w*)')
regex = re.compile(r'(\d*)\s*(\w*)')
result = regex.match(str(size)).groups()
if result[1]:
unit_size = MemoryUnit.validate_unit(result[1])

2
tacker/db/migration/alembic_migrations/versions/000632983ada_add_template_source_column.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-12-22 20:30:03.931290
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '000632983ada'
down_revision = '0ad3bbce1c19'

2
tacker/db/migration/alembic_migrations/versions/0ad3bbce1c18_create_of_network_service_tables.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-12-17 19:41:01.906138
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '0ad3bbce1c18'
down_revision = '8f7145914cb0'

2
tacker/db/migration/alembic_migrations/versions/0ae5b1ce3024_unique_constraint_name.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-09-15 16:27:08.736673
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '0ae5b1ce3024'
down_revision = '507122918800'

2
tacker/db/migration/alembic_migrations/versions/12a57080b277_add_service_db.py
View File

@ -21,6 +21,8 @@ Create Date: 2015-11-26 15:18:19.623170
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '12a57080b277'
down_revision = '5958429bcb3c'

2
tacker/db/migration/alembic_migrations/versions/12a57080b278_alter_devices.py
View File

@ -21,6 +21,8 @@ Create Date: 2015-11-26 15:18:19.623170
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '12a57080b278'
down_revision = '12a57080b277'

2
tacker/db/migration/alembic_migrations/versions/13c0e0661015_add_descrition_to_vnf.py
View File

@ -21,6 +21,8 @@ Create Date: 2015-05-18 18:47:22.180962
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '13c0e0661015'
down_revision = '4c31092895b8'

2
tacker/db/migration/alembic_migrations/versions/13ecc2dd6f7f_change_nullable_value_of_path_id.py
View File

@ -21,6 +21,8 @@ Create Date: 2018-07-24 16:47:01.378226
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '13ecc2dd6f7f'
down_revision = '4747cc26b9c6'

2
tacker/db/migration/alembic_migrations/versions/1c6b0d82afcd_servicevm_framework.py
View File

@ -21,6 +21,8 @@ Create Date: 2013-11-25 18:06:13.980301
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '1c6b0d82afcd'
down_revision = None

2
tacker/db/migration/alembic_migrations/versions/22f5385a3d3f_add_status_to_vims.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-05-12 13:29:30.615609
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '22f5385a3d3f'
down_revision = '5f88e86b35c7'

2
tacker/db/migration/alembic_migrations/versions/22f5385a3d4f_remove_proxydb.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-08-01 15:47:51.161749
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '22f5385a3d4f'
down_revision = 'd4f265e8eb9d'

2
tacker/db/migration/alembic_migrations/versions/22f5385a3d50_rename_devicedb.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-08-01 15:47:51.161749
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '22f5385a3d50'
down_revision = '22f5385a3d4f'

2
tacker/db/migration/alembic_migrations/versions/24bec5f211c7_alter_value_in_deviceattributes.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-01-24 19:21:03.410029
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '24bec5f211c7'
down_revision = '2774a42c7163'

2
tacker/db/migration/alembic_migrations/versions/2774a42c7163_remove_service_related.py
View File

@ -21,6 +21,8 @@ Create Date: 2015-11-26 15:47:51.161749
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '2774a42c7163'
down_revision = '12a57080b278'

2
tacker/db/migration/alembic_migrations/versions/2ff0a0e360f1_audit_support.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-02 15:14:31.888078
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '2ff0a0e360f1'
down_revision = '22f5385a3d50'

2
tacker/db/migration/alembic_migrations/versions/31acbaeb8299_change_vim_shared_property_to_false.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-05-30 23:46:20.034085
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '31acbaeb8299'
down_revision = 'e7993093baf1'

2
tacker/db/migration/alembic_migrations/versions/354de64ba129_set_mandatory_columns_not_null.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-02 10:05:22.299780
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '354de64ba129'
down_revision = 'b07673bb8654'

2
tacker/db/migration/alembic_migrations/versions/4747cc26b9c6_add_support_vnffg_to_ns_database.py
View File

@ -21,6 +21,8 @@ Create Date: 2018-06-27 03:18:12.227673
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '4747cc26b9c6'
down_revision = '5d490546290c'

2
tacker/db/migration/alembic_migrations/versions/4ee19c8a6d0a_audit_support_events.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-07 03:16:53.513392
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '4ee19c8a6d0a'
down_revision = '941b5a6fff9e'

2
tacker/db/migration/alembic_migrations/versions/507122918800_adds_vnffg.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-07-29 21:48:18.816277
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '507122918800'
down_revision = '4ee19c8a6d0a'

2
tacker/db/migration/alembic_migrations/versions/5246a6bd410f_multisite_vim.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-03-22 14:05:15.129330
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '5246a6bd410f'
down_revision = '24bec5f211c7'

2
tacker/db/migration/alembic_migrations/versions/5958429bcb3c_modify_datatype_of_value.py
View File

@ -21,6 +21,8 @@ Create Date: 2015-10-05 17:09:24.710961
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '5958429bcb3c'
down_revision = '13c0e0661015'

2
tacker/db/migration/alembic_migrations/versions/5d490546290c_add_name_to_classifiers.py
View File

@ -21,6 +21,8 @@ Create Date: 2018-01-11 14:27:16.334946
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '5d490546290c'
down_revision = 'e9a1e47fb0b5'

2
tacker/db/migration/alembic_migrations/versions/5f88e86b35c7_make_vnfd_vnf_vim_name_mandatory.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-14 11:16:16.303343
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '5f88e86b35c7'
down_revision = '354de64ba129'

2
tacker/db/migration/alembic_migrations/versions/81ffa86020d_rpc_proxy.py
View File

@ -21,6 +21,8 @@ Create Date: 2014-03-19 15:50:11.712686
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '81ffa86020d'
down_revision = '1c6b0d82afcd'

2
tacker/db/migration/alembic_migrations/versions/8f7145914cb0_remove_infra_driver_column.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-12-08 17:28:26.609343
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '8f7145914cb0'
down_revision = '0ae5b1ce3024'

2
tacker/db/migration/alembic_migrations/versions/941b5a6fff9e_enable_soft_delete.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-06 10:12:49.787430
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '941b5a6fff9e'
down_revision = '2ff0a0e360f1'

4
tacker/db/migration/alembic_migrations/versions/975e28392888_add_unique_key_vnf_package_vnfd.py
View File

@ -26,8 +26,8 @@ Create Date: 2019-12-10 02:40:12.966027
revision = '975e28392888'
down_revision = 'abbef484b34c'
from alembic import op
import sqlalchemy as sa
from alembic import op # noqa: E402
import sqlalchemy as sa # noqa: E402
def _migrate_duplicate_vnf_package_vnfd_id(table):

2
tacker/db/migration/alembic_migrations/versions/985e28392890_add_vnflcm_db.py
View File

@ -14,6 +14,8 @@
# under the License.
#
# flake8: noqa: E402
"""VNF instance management changes
Revision ID: 985e28392890

2
tacker/db/migration/alembic_migrations/versions/9d425296f2c3_add_vnfpkgm_db.py
View File

@ -21,6 +21,8 @@ Create Date: 2019-06-03 08:37:05.095587
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = '9d425296f2c3'
down_revision = 'cd04a8335c18'

2
tacker/db/migration/alembic_migrations/versions/abbef484b34c_modify_unique_constraint_on_vnf_packages_user_data.py
View File

@ -25,7 +25,7 @@ Create Date: 2019-11-18 19:34:26.853715
revision = 'abbef484b34c'
down_revision = '9d425296f2c3'
from alembic import op
from alembic import op # noqa: E402
def upgrade(active_plugins=None, options=None):

2
tacker/db/migration/alembic_migrations/versions/acf941e54075_add_error_reason_to_device.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-04-07 23:53:56.623647
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'acf941e54075'
down_revision = '5246a6bd410f'

2
tacker/db/migration/alembic_migrations/versions/b07673bb8654_set_status_type_tenant_id_length.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-01 12:46:07.499279
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'b07673bb8654'
down_revision = 'c7cde2f45f82'

2
tacker/db/migration/alembic_migrations/versions/c256228ed37c_unique_constraint_on_name_and_id.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-03-01 12:28:58.467900
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'c256228ed37c'
down_revision = 'ef14f8026327'

2
tacker/db/migration/alembic_migrations/versions/c7cde2f45f82_set_description_to_text.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-06-01 10:58:43.022668
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'c7cde2f45f82'
down_revision = '6e56d4474b2a'

2
tacker/db/migration/alembic_migrations/versions/cd04a8335c18_mgmt_url_to_mgmt_ip_address.py
View File

@ -21,6 +21,8 @@ Create Date: 2019-01-25 13:43:10.499421
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'cd04a8335c18'
down_revision = '13ecc2dd6f7f'

2
tacker/db/migration/alembic_migrations/versions/d4f265e8eb9d_add_default_to_vim.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-07-14 11:07:28.115225
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'd4f265e8eb9d'
down_revision = '22f5385a3d3f'

2
tacker/db/migration/alembic_migrations/versions/e7993093baf1_add_unique_constraint_on_deleted_at.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-04-19 10:57:22.157326
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'e7993093baf1'
down_revision = 'c256228ed37c'

2
tacker/db/migration/alembic_migrations/versions/e8918cda6433_add_attributes_to_vnffg.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-02-09 00:11:08.081746
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'e8918cda6433'
down_revision = '000632983ada'

2
tacker/db/migration/alembic_migrations/versions/e9a1e47fb0b5_add_template_source_status_to_vnffgtemplate_and_nsd.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-07-17 10:02:37.572587
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'e9a1e47fb0b5'
down_revision = 'f5c1c3b0f6b4'

2
tacker/db/migration/alembic_migrations/versions/ef14f8026327_add_default_onboarded_template_source.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-02-10 12:10:09.606460
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'ef14f8026327'
down_revision = 'e8918cda6433'

2
tacker/db/migration/alembic_migrations/versions/f5c1c3b0f6b4_set_default_value_for_deleted_at.py
View File

@ -21,6 +21,8 @@ Create Date: 2017-06-23 03:03:12.200270
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'f5c1c3b0f6b4'
down_revision = '31acbaeb8299'

2
tacker/db/migration/alembic_migrations/versions/f958f58e5daa_uuid_consistency.py
View File

@ -21,6 +21,8 @@ Create Date: 2016-05-28 07:13:07.125562
"""
# flake8: noqa: E402
# revision identifiers, used by Alembic.
revision = 'f958f58e5daa'
down_revision = 'acf941e54075'

4
tacker/db/vnfm/vnfm_db.py
View File

@ -348,8 +348,8 @@ class VNFMPluginDb(vnfm.VNFMPluginBase, db_base.CommonDbMixin):
return self._make_vnfd_dict(vnfd_db)
def get_vnfds(self, context, filters, fields=None):
if 'template_source' in filters and \
filters['template_source'][0] == 'all':
if ('template_source' in filters and
filters['template_source'][0] == 'all'):
filters.pop('template_source')
return self._get_collection(context, VNFD,
self._make_vnfd_dict,

2
tacker/glance_store/store.py
View File

@ -97,7 +97,7 @@ def load_csar(package_uuid, location):
try:
resp, size = glance_store.backend.get_from_backend(location)
except Exception as exp:
except Exception:
LOG.info("Failed to get csar data from glance store %(location)s for "
"package %(uuid)s",
{"location": location, "uuid": package_uuid})

12
tacker/hacking/checks.py
View File

@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
import pycodestyle
import re
import pep8
from hacking import core
"""
Guidelines for writing new hacking checks
@ -35,16 +36,13 @@ log_translation = re.compile(
r"(.)*LOG\.(audit|error|info|warn|warning|critical|exception)\(\s*('|\")")
def validate_log_translations(logical_line, physical_line, filename):
@core.flake8ext
def validate_log_translations(physical_line, logical_line, filename):
# Translations are not required in the test directory
if "tacker/tests" in filename:
return
if pep8.noqa(physical_line):
if pycodestyle.noqa(physical_line):
return
msg = "N320: Log messages require translations!"
if log_translation.match(logical_line):
yield (0, msg)
def factory(register):
register(validate_log_translations)

8
tacker/keymgr/barbican_key_manager.py
View File

@ -81,7 +81,7 @@ class BarbicanKeyManager(key_manager.KeyManager):
def _get_keystone_auth(self, context):
if context.__class__.__name__ is 'KeystonePassword':
if context.__class__.__name__ == 'KeystonePassword':
return identity.Password(
auth_url=self._auth_url,
username=context.username,
@ -97,7 +97,7 @@ class BarbicanKeyManager(key_manager.KeyManager):
project_domain_id=context.project_domain_id,
project_domain_name=context.project_domain_name,
reauthenticate=context.reauthenticate)
elif context.__class__.__name__ is 'KeystoneToken':
elif context.__class__.__name__ == 'KeystoneToken':
return identity.Token(
auth_url=self._auth_url,
token=context.token,
@ -111,8 +111,8 @@ class BarbicanKeyManager(key_manager.KeyManager):
reauthenticate=context.reauthenticate)
# this will be kept for oslo.context compatibility until
# projects begin to use utils.credential_factory
elif (context.__class__.__name__ is 'RequestContext' or
context.__class__.__name__ is 'Context'):
elif (context.__class__.__name__ == 'RequestContext' or
context.__class__.__name__ == 'Context'):
return identity.Token(
auth_url=self._auth_url,
token=context.auth_token,

2
tacker/nfvo/drivers/workflow/workflow_generator.py
View File

@ -62,8 +62,6 @@ class WorkflowGenerator(workflow_generator.WorkflowGeneratorBase):
'retry': {
'count': 10,
'delay': 10,
'break-on': '<% $.status_{0} = "ACTIVE" '
'%>'.format(node),
'break-on': '<% $.status_{0} = "ERROR"'
' %>'.format(node),
'continue-on': '<% $.status_{0} = "PENDING_CREATE" '

3
tacker/objects/vnf_package.py
View File

@ -69,7 +69,8 @@ def _add_user_defined_data(context, package_uuid, user_data,
def _vnf_package_user_data_get_query(context, package_uuid, model):
return api.model_query(context, model, read_deleted="no", project_only=True).\
return api.model_query(context, model, read_deleted="no",
project_only=True).\
filter_by(package_uuid=package_uuid)

2
tacker/policy.py
View File

@ -316,7 +316,7 @@ class FieldCheck(policy.Check):
attr = attributes.RESOURCE_ATTRIBUTE_MAP[resource][field]
conv_func = attr['convert_to']
except KeyError:
conv_func = lambda x: x
conv_func = lambda x: x # noqa: E731
self.field = field
self.value = conv_func(value)

1
tacker/tests/common/helpers.py
View File

@ -26,6 +26,7 @@ def requires_py2(testcase):
def requires_py3(testcase):
return testtools.skipUnless(six.PY3, "requires python 3.x")(testcase)
if sys.version_info < (3,):
def compact_byte(x):
return x

35
tacker/tests/unit/db/utils.py
View File

@ -29,6 +29,7 @@ def _get_template(name):
f = codecs.open(filename, encoding='utf-8', errors='strict')
return f.read()
tosca_cvnf_vnfd = _get_template('test_tosca_cvnf.yaml')
tosca_vnfd_openwrt = _get_template('test_tosca_openwrt.yaml')
tosca_vnfd_openwrt_param = _get_template('test_tosca_openwrt_param.yaml')
@ -164,24 +165,6 @@ def get_dummy_vnf_invalid_param_type_obj():
return {'vnf': {u'attributes': {u'param_values': 'dummy_param'}}}
def get_dummy_vnf_invalid_config_type_obj():
return {'vnf': {u'attributes': {u'config': 'dummy_config'}}}
def get_dummy_vnf_invalid_param_content():
return {'vnf': {u'attributes': {u'param_values': {}}}}
def get_dummy_vnf_param_obj():
return {'vnf': {u'attributes': {u'param_values':
{'flavor': 'm1.tiny',
'reservation_id': '99999999-3925-4c9e-9074-239a902b68d7'}}}}
def get_dummy_vnf_invalid_param_type_obj():
return {'vnf': {u'attributes': {u'param_values': 'dummy_param'}}}
def get_dummy_vnf(status='PENDING_CREATE', scaling_group=False,
instance_id=None):
dummy_vnf = {'status': status, 'instance_id': instance_id, 'name':
@ -264,22 +247,6 @@ def get_dummy_vnf_update_empty_param():
return {'vnf': {'attributes': {'param_values': {}}}}
def get_dummy_vnf_update_param():
return {'vnf': {'attributes': {'param_values': update_param_data}}}
def get_dummy_vnf_update_new_param():
return {'vnf': {'attributes': {'param_values': update_new_param_data}}}
def get_dummy_vnf_update_invalid_param():
return {'vnf': {'attributes': {'param_values': update_invalid_param_data}}}
def get_dummy_vnf_update_empty_param():
return {'vnf': {'attributes': {'param_values': {}}}}
def get_vim_obj():
return {'vim': {'type': 'openstack',
'auth_url': 'http://localhost/identity',

1
tacker/tests/unit/objects/fakes.py
View File

@ -284,6 +284,7 @@ def get_instantiated_vnf_info():
}
return instantiated_vnf_info
instantiated_vnf_info = {
'ext_cp_info': [vnf_ext_cp_info],
'flavour_id': uuidsentinel.flavour_id,

4
tacker/tosca/utils.py
View File

@ -349,7 +349,7 @@ def get_volumes(template):
for prop_name, prop_value in block_properties.items():
if prop_name == 'size':
prop_value = \
re.compile('(\d+)\s*(\w+)').match(prop_value).groups()[0]
re.compile(r'(\d+)\s*(\w+)').match(prop_value).groups()[0]
volume_dict[node_name][prop_name] = prop_value
del node_tpl[node_name]
return volume_dict
@ -1145,7 +1145,7 @@ def get_resources_dict(template, flavor_extra_input=None):
res_dict = dict()
for res, method in (OS_RESOURCES).items():
res_method = getattr(sys.modules[__name__], method)
if res is 'flavor':
if res == 'flavor':
res_dict[res] = res_method(template, flavor_extra_input)
else:
res_dict[res] = res_method(template)

4
tacker/vnfm/infra_drivers/openstack/openstack.py
View File

@ -982,8 +982,8 @@ class OpenStack(abstract_driver.VnfAbstractDriver,
for resource in vdu_resources:
for stack_uuid, resources in stack_resources.items():
res_details = resources.get(resource['resource_name'])
if res_details and res_details['physical_resource_id'] == \
resource['physical_resource_id']:
if (res_details and res_details['physical_resource_id'] ==
resource['physical_resource_id']):
yield stack_uuid, resource['resource_name']
def _resource_mark_unhealthy():

3
tacker/vnfm/monitor.py
View File

@ -174,8 +174,7 @@ class VNFMonitor(object):
vdu_delay = params.get('monitoring_delay', vnf_delay)
if not timeutils.is_older_than(
hosting_vnf['boot_at'],
if not timeutils.is_older_than(hosting_vnf['boot_at'],
vdu_delay):
continue

1
tacker/vnfm/monitor_drivers/ceilometer/ceilometer.py
View File

@ -37,6 +37,7 @@ cfg.CONF.register_opts(OPTS, group='ceilometer')
def config_opts():
return [('ceilometer', OPTS)]
ALARM_INFO = (
ALARM_ACTIONS, OK_ACTIONS, REPEAT_ACTIONS, ALARM,
INSUFFICIENT_DATA_ACTIONS, DESCRIPTION, ENABLED, TIME_CONSTRAINTS,

3
tacker/wsgi.py
View File

@ -83,6 +83,7 @@ CONF.register_opts(socket_opts)
def config_opts():
return [(None, socket_opts)]
LOG = logging.getLogger(__name__)
@ -1038,7 +1039,7 @@ class Resource(Application):
action_result = self.dispatch(request, action, args)
except Fault as ex:
response = ex
except Exception as ex:
except Exception:
raise Fault(webob.exc.HTTPInternalServerError())
if not response:

2
test-requirements.txt
View File

@ -8,7 +8,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT
doc8>=0.6.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
hacking>=3.0,<3.1.0 # Apache-2.0
mock>=3.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD
python-tackerclient>=0.8.0 # Apache-2.0

10
tox.ini
View File

@ -85,14 +85,20 @@ commands = {posargs}
[flake8]
# E128 continuation line under-indented for visual indent
# N320 log messages does not translate
ignore = E128,N320
# W503 line break before binary operator
# W504 line break after binary operator
ignore = E128,N320,W503,W504
show-source = true
builtins = _
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.ropeproject
[hacking]
import_exceptions = tacker._i18n
local-check-factory = tacker.hacking.checks.factory
[flake8:local-plugins]
extension =
N320 = checks:validate_log_translations
paths = ./tacker/hacking
[testenv:config-gen]
commands =