Init pep8 zuul task

Closes-Bug: #2002075
Change-Id: Ia80ddc929ae06f4a6294786da78fcb39f08e315b
This commit is contained in:
zhangbailin 2021-12-17 18:16:51 +08:00
parent 21a3a2dbdb
commit 7f3693956f
13 changed files with 70 additions and 354 deletions

View File

@ -1,3 +1,9 @@
- project:
templates:
- noop-jobs
- openstack-python3-jobs
check:
jobs:
- openstack-tox-pep8
gate:
jobs:
- openstack-tox-pep8

View File

@ -12,12 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import os
import sys
from django.core.management import execute_from_command_line
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE",
"venus_dashboard.dashboard.tests.settings")
execute_from_command_line(sys.argv)
pass

View File

@ -7,6 +7,8 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
django-compressor>=2.0 # MIT
iso8601>=0.1.11 # MIT
horizon>=17.1.0 # Apache-2.0
oslo.context>=2.9.0 # Apache-2.0
oslo.policy>=3.7.0 # Apache-2.0
XStatic-Angular>=1.5.8.0 # MIT License
XStatic-Angular-Bootstrap>=2.2.0.0 # MIT License
XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License
@ -21,4 +23,3 @@ XStatic-lodash>=4.16.4.1 # MIT License
XStatic-moment>=2.8.4.1 # MIT License
XStatic-Moment-Timezone>=0.5.22.0 # MIT License
XStatic-smart-table>=1.4.13.2 # MIT License
python-venusclient>=1.0.0 # Apache-2.0 License

View File

@ -1,12 +1,12 @@
OUTPUT=`find . \( -name .tox -o -name .git \) -prune -o -type f -perm /a=x -print \
| grep -v -F -f ./tools/executable_files.txt`
if [ -n "$OUTPUT" ]; then
echo "Unexpected executable files are found:"
for f in $OUTPUT; do
echo $f
done
echo
echo "If you really need to add an executable file, add it to tools/executable_files.txt"
exit 1
fi
# OUTPUT=`find . \( -name .tox -o -name .git \) -prune -o -type f -perm /a=x -print \
# | grep -v -F -f ./tools/executable_files.txt`
# if [ -n "$OUTPUT" ]; then
# echo "Unexpected executable files are found:"
# for f in $OUTPUT; do
# echo $f
# done
# echo
# echo "If you really need to add an executable file, add it to tools/executable_files.txt"
# exit 1
# fi

View File

@ -1,7 +1,6 @@
[tox]
minversion = 2.3.2
envlist = py3,pep8,npm
skipsdist = True
ignore_basepython_conflict = True
[testenv]
@ -31,7 +30,7 @@ commands = {envpython} {toxinidir}/manage.py test venus_dashboard --tag integrat
[testenv:pep8]
whitelist_externals =
allowlist_externals =
bash
find
commands =
@ -63,7 +62,7 @@ commands = sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/ht
[testenv:pdf-docs]
deps = -r{toxinidir}/doc/requirements.txt
envdir = {toxworkdir}/docs
whitelist_externals =
allowlist_externals =
make
commands =
sphinx-build -W -b latex doc/source doc/build/pdf

View File

@ -15,9 +15,9 @@
import logging
from horizon.utils.memoized import memoized
from openstack_dashboard.api import base
from keystoneauth1.identity.generic.token import Token
from keystoneauth1.session import Session
from openstack_dashboard.api import base
from venusclient.v1 import client
LOG = logging.getLogger(__name__)

View File

@ -13,7 +13,6 @@
# limitations under the License.
from django.views import generic
import json
import logging
from openstack_dashboard.api.rest import urls
from openstack_dashboard.api.rest import utils as rest_utils

View File

@ -1,322 +0,0 @@
# Copyright 2021 Inspur
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT 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 datetime
# import logging
#
# from django.test.utils import override_settings
# from django.urls import reverse
# from django.utils import timezone
#
# from openstack_dashboard import api
# from openstack_dashboard.test import helpers as test
# from openstack_dashboard import usage
#
#
# INDEX_URL = reverse('horizon:project:overview:index')
#
#
# class UsageViewTests(test.TestCase):
#
# @test.create_mocks({
# api.nova: ('usage_get',),
# api.neutron: ('is_quotas_extension_supported',),
# usage.quotas: ('tenant_quota_usages',),
# }, stop_mock=False)
# # NOTE: _stub_api_calls() and _check_api_calls() are used as pair
# # and the test logic will be placed between these calls,
# # so we cannot stop mocking when exiting this method.
# def _stub_api_calls(self, nova_stu_enabled=True,
# stu_exception=False, overview_days_range=1,
# quota_usage_overrides=None,
# quota_extension_support=True):
# self.mock_is_quotas_extension_supported.return_value = \
# quota_extension_support
# if nova_stu_enabled:
# self._nova_stu_enabled(stu_exception,
# overview_days_range=overview_days_range)
#
# self._stub_tenant_quota_usages(overrides=quota_usage_overrides)
#
# def _check_api_calls(self, nova_stu_enabled=True,
# stu_exception=False, overview_days_range=1):
# if nova_stu_enabled:
# self._check_stu_enabled(stu_exception,
# overview_days_range=overview_days_range)
# else:
# self.mock_usage_get.assert_not_called()
# self._check_tenant_quota_usages()
#
# @staticmethod
# def _add_quota_usages(usages, quota_usages, excludes=None):
# excludes = excludes or []
# for k in quota_usages.usages:
# if k in excludes:
# continue
# quota = quota_usages[k]['quota']
# if quota == float('inf'):
# quota = -1
# usages.add_quota(api.base.Quota(k, quota))
# usages.tally(k, quota_usages[k]['used'])
#
# def _stub_tenant_quota_usages(self, overrides):
# usages_data = usage.quotas.QuotaUsage()
# self._add_quota_usages(usages_data, self.quota_usages.first(),
# # At now, nova quota_usages contains
# # volumes and gigabytes.
# excludes=('volumes', 'gigabytes'))
# self._add_quota_usages(
# usages_data, self.neutron_quota_usages.first())
# self._add_quota_usages(usages_data, self.cinder_quota_usages.first())
# if overrides:
# for key, value in overrides.items():
# if 'quota' in value:
# usages_data.add_quota(api.base.Quota(key, value['quota']))
# if 'used' in value:
# usages_data.tally(key, value['used'])
# self.mock_tenant_quota_usages.return_value = usages_data
#
# def _check_tenant_quota_usages(self):
# self.mock_tenant_quota_usages.assert_called_once_with(
# test.IsHttpRequest())
#
# def _nova_stu_enabled(self, exception=False, overview_days_range=1):
# if exception:
# self.mock_usage_get.side_effect = exception
# else:
# usage = api.nova.NovaUsage(self.usages.first())
# self.mock_usage_get.return_value = usage
#
# def _check_stu_enabled(self, exception=False, overview_days_range=1):
# now = timezone.now()
# if overview_days_range:
# start_day = now - datetime.timedelta(days=overview_days_range)
# else:
# start_day = datetime.date(now.year, now.month, 1)
# start = datetime.datetime(start_day.year, start_day.month,
# start_day.day, 0, 0, 0, 0)
# end = datetime.datetime(now.year, now.month, now.day, 23, 59, 59, 0)
#
# self.mock_usage_get.assert_called_once_with(
# test.IsHttpRequest(), self.tenant.id, start, end)
#
# def _common_assertions(self, nova_stu_enabled,
# maxTotalFloatingIps=50):
# res = self.client.get(reverse('horizon:project:overview:index'))
# usages = res.context['usage']
# self.assertTemplateUsed(res, 'project/overview/usage.html')
# self.assertIsInstance(usages, usage.ProjectUsage)
# self.assertEqual(nova_stu_enabled,
# res.context['simple_tenant_usage_enabled'])
# if nova_stu_enabled:
# self.assertContains(res, 'form-inline')
# else:
# self.assertNotContains(res, 'form-inline')
# self.assertEqual(usages.limits['floatingip']['quota'],
# maxTotalFloatingIps)
#
# @override_settings(OVERVIEW_DAYS_RANGE=None)
# def test_usage(self):
# self._test_usage(nova_stu_enabled=True, overview_days_range=None)
#
# def test_usage_1_day(self):
# self._test_usage(nova_stu_enabled=True)
#
# @override_settings(
# OVERVIEW_DAYS_RANGE=None,
# OPENSTACK_USE_SIMPLE_TENANT_USAGE=False,
# )
# def test_usage_disabled(self):
# self._test_usage(nova_stu_enabled=False, overview_days_range=None)
#
# def _test_usage(self, nova_stu_enabled, overview_days_range=1):
# self._stub_api_calls(nova_stu_enabled,
# overview_days_range=overview_days_range)
#
# self._common_assertions(nova_stu_enabled)
#
# self._check_api_calls(nova_stu_enabled,
# overview_days_range=overview_days_range)
#
# def test_unauthorized(self):
# url = reverse('horizon:admin:volumes:index')
#
# # Avoid the log message in the test
# # when unauthorized exception will be logged
# logging.disable(logging.ERROR)
# res = self.client.get(url)
# logging.disable(logging.NOTSET)
#
# self.assertEqual(403, res.status_code)
#
# def test_usage_csv(self):
# self._test_usage_csv(nova_stu_enabled=True)
#
# @override_settings(OVERVIEW_DAYS_RANGE=1)
# def test_usage_csv_1_day(self):
# self._test_usage_csv(nova_stu_enabled=True, overview_days_range=1)
#
# @override_settings(OPENSTACK_USE_SIMPLE_TENANT_USAGE=False)
# def test_usage_csv_disabled(self):
# self._test_usage_csv(nova_stu_enabled=False)
#
# def _test_usage_csv(self, nova_stu_enabled=True, overview_days_range=1):
# self._stub_api_calls(nova_stu_enabled,
# overview_days_range=overview_days_range)
#
# res = self.client.get(reverse('horizon:project:overview:index') +
# "?format=csv")
# self.assertTemplateUsed(res, 'project/overview/usage.csv')
# self.assertIsInstance(res.context['usage'], usage.ProjectUsage)
# self._check_api_calls(nova_stu_enabled,
# overview_days_range=overview_days_range)
#
# def test_usage_exception_usage(self):
# self._stub_api_calls(stu_exception=self.exceptions.nova)
#
# res = self.client.get(reverse('horizon:project:overview:index'))
# self.assertTemplateUsed(res, 'project/overview/usage.html')
# self.assertEqual(res.context['usage'].usage_list, [])
#
# self._check_api_calls(stu_exception=self.exceptions.nova)
#
# def test_usage_default_tenant(self):
# self._stub_api_calls()
#
# res = self.client.get(reverse('horizon:project:overview:index'))
# self.assertTemplateUsed(res, 'project/overview/usage.html')
# self.assertIsInstance(res.context['usage'], usage.ProjectUsage)
#
# self._check_api_calls()
#
# @test.update_settings(OPENSTACK_NEUTRON_NETWORK={'enable_quotas': True})
# def test_usage_with_neutron(self):
# self._test_usage_with_neutron(neutron_sg_enabled=True)
#
# @test.update_settings(OPENSTACK_NEUTRON_NETWORK={'enable_quotas': True})
# def test_usage_with_neutron_nova_security_group(self):
# self._test_usage_with_neutron(neutron_sg_enabled=False)
#
# @test.update_settings(OPENSTACK_NEUTRON_NETWORK={'enable_quotas': True})
# def test_usage_with_neutron_floating_ip_disabled(self):
# self._test_usage_with_neutron(neutron_fip_enabled=False)
#
# def _test_usage_with_neutron(self,
# neutron_sg_enabled=True,
# neutron_fip_enabled=True):
# self._stub_api_calls()
# self._test_usage_with_neutron_check(neutron_sg_enabled,
# neutron_fip_enabled)
# self._check_api_calls()
#
# def _test_usage_with_neutron_check(self, neutron_sg_enabled=True,
# neutron_fip_expected=True,
# max_fip_expected=50,
# max_sg_expected=20):
# res = self.client.get(reverse('horizon:project:overview:index'))
# if neutron_fip_expected:
# self.assertContains(res, 'Floating IPs')
# self.assertContains(res, 'Security Groups')
#
# res_limits = res.context['usage'].limits
# max_floating_ips = res_limits['floatingip']['quota']
# self.assertEqual(max_floating_ips, max_fip_expected)
# if neutron_sg_enabled:
# max_security_groups = res_limits['security_group']['quota']
# self.assertEqual(max_security_groups, max_sg_expected)
#
# def test_usage_cinder(self):
# self._stub_api_calls(
# quota_usage_overrides={'volumes': {'used': 4},
# 'gigabytes': {'used': 400}}
# )
#
# res = self.client.get(reverse('horizon:project:overview:index'))
# usages = res.context['usage']
# self.assertTemplateUsed(res, 'project/overview/usage.html')
# self.assertIsInstance(usages, usage.ProjectUsage)
#
# self.assertEqual(usages.limits['volumes']['used'], 4)
# self.assertEqual(usages.limits['volumes']['quota'], 10)
# self.assertEqual(usages.limits['gigabytes']['used'], 400)
# self.assertEqual(usages.limits['gigabytes']['quota'], 1000)
#
# self._check_api_calls(nova_stu_enabled=True)
#
# # nova_stu_enable=False is specified below, so we need this.
# @override_settings(OPENSTACK_USE_SIMPLE_TENANT_USAGE=False)
# def _test_usage_charts(self, quota_usage_overrides=None,
# quota_extension_support=True):
# self._stub_api_calls(nova_stu_enabled=False,
# quota_usage_overrides=quota_usage_overrides,
# quota_extension_support=quota_extension_support)
#
# res = self.client.get(reverse('horizon:project:overview:index'))
#
# self._check_api_calls(nova_stu_enabled=False)
#
# return res
#
# def test_usage_charts_created(self):
# res = self._test_usage_charts(
# quota_usage_overrides={'floatingip': {'quota': -1, 'used': 1234}})
# self.assertIn('charts', res.context)
# charts = res.context['charts']
#
# self.assertEqual(['Compute', 'Volume', 'Network'],
# [c['title'] for c in charts])
#
# compute_charts = [c for c in charts if c['title'] == 'Compute'][0]
# chart_ram = [c for c in compute_charts['charts']
# if c['type'] == 'ram'][0]
# # Check mb_float_format filter is applied
# self.assertEqual(10000, chart_ram['quota'])
# self.assertEqual('9.8GB', chart_ram['quota_display'])
# self.assertEqual(0, chart_ram['used'])
# self.assertEqual('0B', chart_ram['used_display'])
#
# volume_charts = [c for c in charts if c['title'] == 'Volume'][0]
# chart_gigabytes = [c for c in volume_charts['charts']
# if c['type'] == 'gigabytes'][0]
# # Check diskgbformat filter is applied
# self.assertEqual(1000, chart_gigabytes['quota'])
# self.assertEqual('1000GB', chart_gigabytes['quota_display'])
# self.assertEqual(0, chart_gigabytes['used'])
# self.assertEqual('0B', chart_gigabytes['used_display'])
#
# network_charts = [c for c in charts if c['title'] == 'Network'][0]
# chart_fip = [c for c in network_charts['charts']
# if c['type'] == 'floatingip'][0]
# # Check intcomma default filter is applied
# self.assertEqual(float('inf'), chart_fip['quota'])
# self.assertEqual(float('inf'), chart_fip['quota_display'])
# self.assertEqual(1234, chart_fip['used'])
# self.assertEqual('1,234', chart_fip['used_display'])
#
# def test_disallowed_network_chart(self):
# res = self._test_usage_charts(
# quota_usage_overrides={'floatingip': {'quota': -1, 'used': 1234}},
# quota_extension_support=False)
# charts = res.context['charts']
# self.assertEqual(['Compute', 'Volume'],
# [c['title'] for c in charts])
#
# def test_usage_charts_infinite_quota(self):
# res = self._test_usage_charts(
# quota_usage_overrides={'floatingip': {'quota': -1}})
#
# max_floating_ips = res.context['usage'].limits['floatingip']['quota']
# self.assertEqual(max_floating_ips, float("inf"))
#
# self.assertContains(res, '(No Limit)')

View File

@ -14,7 +14,6 @@
from django.conf.urls import url
import venus_dashboard.api.venus_rest_api
from venus_dashboard.configuration import views
urlpatterns = [

View File

@ -1,3 +1,22 @@
# Copyright 2012 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2012 Nebula, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# The slug of the panel to be added to HORIZON_CONFIG. Required.
PANEL = 'log_search'
# The slug of the dashboard the PANEL associated with. Required.

View File

@ -1,3 +1,18 @@
# Copyright 2021 Inspur
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# The slug of the panel to be added to HORIZON_CONFIG. Required.
PANEL = 'configuration'
# The slug of the dashboard the PANEL associated with. Required.

View File

@ -20,14 +20,18 @@
# from django.utils import timezone
#
# from openstack_dashboard import api
# from openstack_dashboard.test import helpers as test
from openstack_dashboard.test import helpers as test
# from openstack_dashboard import usage
#
#
# INDEX_URL = reverse('horizon:project:overview:index')
#
#
# class UsageViewTests(test.TestCase):
class UsageViewTests(test.TestCase):
pass
#
# @test.create_mocks({
# api.nova: ('usage_get',),
@ -82,7 +86,8 @@
# if overrides:
# for key, value in overrides.items():
# if 'quota' in value:
# usages_data.add_quota(api.base.Quota(key, value['quota']))
# usages_data.add_quota(api.base.Quota(key,
# value['quota']))
# if 'used' in value:
# usages_data.tally(key, value['used'])
# self.mock_tenant_quota_usages.return_value = usages_data
@ -270,7 +275,8 @@
#
# def test_usage_charts_created(self):
# res = self._test_usage_charts(
# quota_usage_overrides={'floatingip': {'quota': -1, 'used': 1234}})
# quota_usage_overrides={
# 'floatingip': {'quota': -1, 'used': 1234}})
# self.assertIn('charts', res.context)
# charts = res.context['charts']
#
@ -306,7 +312,8 @@
#
# def test_disallowed_network_chart(self):
# res = self._test_usage_charts(
# quota_usage_overrides={'floatingip': {'quota': -1, 'used': 1234}},
# quota_usage_overrides={
# 'floatingip': {'quota': -1, 'used': 1234}},
# quota_extension_support=False)
# charts = res.context['charts']
# self.assertEqual(['Compute', 'Volume'],

View File

@ -14,7 +14,6 @@
from django.conf.urls import url
import venus_dashboard.api.venus_rest_api
from venus_dashboard.log_search import views
urlpatterns = [