Deal with new flake8 error

Change-Id: I2d0f2c289a30ca7417b28f91b86958977128d944
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>

code/daisyclient/daisyclient/openstack/common/apiclient/utils.py

@@ -87,16 +87,12 @@ def find_resource(manager, name_or_id, **find_args):
         except exceptions.NotFound:
             msg = _("No %(name)s with a name or "
                     "ID of '%(name_or_id)s' exists.") % \
-                {
+                {"name": manager.resource_class.__name__.lower(),
-                    "name": manager.resource_class.__name__.lower(),
+                 "name_or_id": name_or_id}
-                    "name_or_id": name_or_id
-            }
             raise exceptions.CommandError(msg)
     except exceptions.NoUniqueMatch:
         msg = _("Multiple %(name)s matches found for "
                 "'%(name_or_id)s', use an ID to be more specific.") % \
-            {
+            {"name": manager.resource_class.__name__.lower(),
-                "name": manager.resource_class.__name__.lower(),
+             "name_or_id": name_or_id}
-                "name_or_id": name_or_id
-        }
         raise exceptions.CommandError(msg)

code/daisyclient/daisyclient/v1/shell.py

@@ -955,7 +955,7 @@ def do_service_update(gc, args):
 @utils.arg('--nova-lv-size', metavar='<NOVA_LV_SIZE>',
            help='the size of logic volume disk for nvoa, and the unit is MB.')
 @utils.arg('--disk-location', metavar='<DISK_LOCATION>',
-           help='where disks used by backends application from, default is "local". \
+           help='where disks used by backends from, default is "local". \
                  "local" means disks come from local host, \
                  "share" means disks come from share storage devices')
 @utils.arg('--role-type', metavar='<ROLE_TYPE>',
@@ -1079,7 +1079,7 @@ def do_role_detail(gc, args):
 @utils.arg('--docker-vg-size', metavar='<DOCKER_VG_SIZE>',
            help='the size of docker_vg(M).')
 @utils.arg('--disk-location', metavar='<DISK_LOCATION>',
-           help='where disks used by backends application from, default is "local". \
+           help='where disks used by backends from, default is "local". \
                  "local" means disks come from local host, \
                  "share" means disks come from share storage devices')
 @utils.arg('--ntp-server', metavar='<NTP_SERVER>',

code/daisyclient/tox.ini

@@ -36,6 +36,6 @@ downloadcache = ~/cache/pip
 # H302  import only modules
 # H303  no wildcard import
 # H404  multi line docstring should start with a summary
-ignore = F403,F812,F821,H233,H302,H303,H404,F841,F401,E731,H101,H201,H231,H233,H237,H238,H301,H306,H401,H403,H701,H702,H703,F999
+ignore = F403,F812,F821,H233,H302,H303,H404,F841,F401,E731,H101,H201,H231,H233,H237,H238,H301,H306,H401,H403,H701,H702,H703,F999,H402
 show-source = True
 exclude = .venv,.tox,dist,doc,*egg,build

code/horizon/openstack_dashboard/api/daisy.py

@@ -1,4 +1,22 @@
-from __future__ import absolute_import
+# 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.
+
+from __future__ import absolute_import
 
 from django.conf import settings
 

code/horizon/openstack_dashboard/dashboards/director_theme/__init__.py

@@ -1 +0,0 @@
-# intentionally left blank

code/horizon/openstack_dashboard/dashboards/director_theme/models.py

@@ -1 +0,0 @@
-# intentionally left blank

code/horizon/openstack_dashboard/dashboards/environment/cluster/create_cluster.py

@@ -1,7 +1,21 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 json
 from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions

code/horizon/openstack_dashboard/dashboards/environment/cluster/modify_cluster.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
 
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt

code/horizon/openstack_dashboard/dashboards/environment/cluster/net_plane.py

@@ -1,7 +1,21 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 logging
 
 from django.http import HttpResponse

code/horizon/openstack_dashboard/dashboards/environment/cluster/role.py

@@ -1,7 +1,21 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 logging
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt

code/horizon/openstack_dashboard/dashboards/environment/cluster/views.py

@@ -1,7 +1,21 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 json
 
 from django import http

code/horizon/openstack_dashboard/dashboards/environment/configure/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
 
 from django.http import HttpResponse
 from django.views import generic

code/horizon/openstack_dashboard/dashboards/environment/deploy/bonding_views.py

@@ -1,7 +1,20 @@
-#
+# Copyright 2012 United States Government as represented by the
-#   Copyright ZTE
+# Administrator of the National Aeronautics and Space Administration.
-#   Daisy Tools Dashboard
+# 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.
 
 import json
 import logging

code/horizon/openstack_dashboard/dashboards/environment/deploy/deploy_rule_lib.py

@@ -1,7 +1,21 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
+
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.translation import ugettext_lazy as _
 
@@ -385,11 +399,6 @@ def deploy_rule_func(request, cluster_id):
 
 
 def ip_into_int(ip):
-    """
-    Switch ip string to decimalism integer..
-    :param ip: ip string
-    :return: decimalism integer
-    """
     return reduce(lambda x, y: (x << 8) + y, map(int, ip.split('.')))
 
 

code/horizon/openstack_dashboard/dashboards/environment/deploy/hosts_config_views.py

@@ -1,7 +1,21 @@
-#
+# Copyright 2012 United States Government as represented by the
-#   Copyright ZTE
+# Administrator of the National Aeronautics and Space Administration.
-#   Daisy Tools Dashboard
+# 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.
+
 import os
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt

code/horizon/openstack_dashboard/dashboards/environment/deploy/hosts_role_assignment_views.py

@@ -1,7 +1,20 @@
-#
+# Copyright 2012 United States Government as represented by the
-#   Copyright ZTE
+# Administrator of the National Aeronautics and Space Administration.
-#   Daisy Tools Dashboard
+# 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.
 
 import json
 

code/horizon/openstack_dashboard/dashboards/environment/deploy/network_mapping_views.py

@@ -1,7 +1,20 @@
-#
+# Copyright 2012 United States Government as represented by the
-#   Copyright ZTE
+# Administrator of the National Aeronautics and Space Administration.
-#   Daisy Tools Dashboard
+# 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.
 
 import json
 

code/horizon/openstack_dashboard/dashboards/environment/deploy/os_config_views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
 
 from django import http
 from django.views import generic

code/horizon/openstack_dashboard/dashboards/environment/deploy/select_host_views.py

@@ -1,3 +1,21 @@
+# 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.
+
 from django.http import HttpResponse
 
 from horizon import exceptions as horizon_exceptions

code/horizon/openstack_dashboard/dashboards/environment/deploy/tables.py

@@ -1,3 +1,21 @@
+# 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.
+
 import logging
 
 from django.utils.translation import ugettext_lazy as _

code/horizon/openstack_dashboard/dashboards/environment/deploy/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 json
 

code/horizon/openstack_dashboard/dashboards/environment/healthy/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
 
 from django.http import HttpResponse
 from django.views import generic

code/horizon/openstack_dashboard/dashboards/environment/host/views.py

@@ -1,3 +1,21 @@
+# 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.
+
 from horizon import forms
 from horizon import tables
 from django import template

code/horizon/openstack_dashboard/dashboards/environment/overview/views.py

@@ -1,3 +1,21 @@
+# 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.
+
 from horizon import views
 from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponse

code/horizon/openstack_dashboard/dashboards/environment/overview/workflow.py

@@ -1,3 +1,21 @@
+# 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.
+
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
 from django.forms.widgets import RadioSelect

code/horizon/openstack_dashboard/dashboards/environment/system/system_config_views.py

@@ -1,3 +1,21 @@
+# 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.
+
 from horizon import views
 
 

code/horizon/openstack_dashboard/dashboards/environment/system/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 os
 import logging

code/horizon/openstack_dashboard/dashboards/environment/template/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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.
 
 from django import shortcuts
 from horizon.utils import memoized

code/horizon/openstack_dashboard/dashboards/environment/version/views.py

@@ -1,7 +1,20 @@
+# Copyright 2012 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
 #
-#   Copyright ZTE
+# Copyright 2012 Nebula, Inc.
-#   Daisy Tools Dashboard
 #
+#    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 os
 import json

code/horizon/tox.ini

@@ -17,18 +17,15 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
+commands = python setup.py testr --testr-args='{posargs}'
-
 [testenv:pep8]
-commands =
+commands = flake8
-  /bin/bash run_tests.sh -N --pep8
-  /bin/bash run_tests.sh -N --makemessages --check-only
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:cover]
-commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
+commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:py27dj14]
 basepython = python2.7

test/tempest/tox.ini

@@ -1,3 +1,14 @@
+[tox]
+envlist = py26,py27,py33,py34,pypy,pep8
+minversion = 1.6
+skipsdist = True
+
+[testenv:pep8]
+commands = flake8
+
+[testenv:venv]
+commands = {posargs}
+
 [flake8]
 # E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved.  For further detail see https://review.openstack.org/#/c/36788/
 # E123 skipped because it is ignored by default in the default pep8

tools/daisy-compile-rpm.sh

@@ -45,4 +45,5 @@ yum -y install \
   gcc \
   autoconf \
   automake \
-  glibc-devel
+  glibc-devel \
+  fontawesome-fonts-web