After the services split, get neutron-fwaas Jenkins jobs passing
- Temporarily skip all unit tests, until alembic chains are sorted. Change-Id: I38f88c8f4638b7c3787479b70bbfe001f3c9f3cd
This commit is contained in:
parent
6f7cb5030f
commit
e6e929b60f
|
@ -9,6 +9,7 @@ doc/build
|
||||||
*.DS_Store
|
*.DS_Store
|
||||||
*.pyc
|
*.pyc
|
||||||
neutron.egg-info/
|
neutron.egg-info/
|
||||||
|
neutron-fwaas.egg-info/
|
||||||
neutron/vcsversion.py
|
neutron/vcsversion.py
|
||||||
neutron/versioninfo
|
neutron/versioninfo
|
||||||
pbr*.egg/
|
pbr*.egg/
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION
|
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron_fwaas/tests/unit} $LISTOPT $IDOPTION
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
|
|
|
@ -0,0 +1,240 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright (c) 2010 OpenStack Foundation.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
#
|
||||||
|
# Keystone documentation build configuration file, created by
|
||||||
|
# sphinx-quickstart on Tue May 18 13:50:15 2010.
|
||||||
|
#
|
||||||
|
# This file is execfile()'d with the current directory set to it's containing
|
||||||
|
# dir.
|
||||||
|
#
|
||||||
|
# Note that not all possible configuration values are present in this
|
||||||
|
# autogenerated file.
|
||||||
|
#
|
||||||
|
# All configuration values have a default; values that are commented out
|
||||||
|
# serve to show the default.
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
# If extensions (or modules to document with autodoc) are in another directory,
|
||||||
|
# add these directories to sys.path here. If the directory is relative to the
|
||||||
|
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
||||||
|
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
ROOT_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
|
||||||
|
sys.path.insert(0, ROOT_DIR)
|
||||||
|
|
||||||
|
# -- General configuration ---------------------------------------------------
|
||||||
|
|
||||||
|
# Add any Sphinx extension module names here, as strings. They can be
|
||||||
|
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||||
|
extensions = ['sphinx.ext.autodoc',
|
||||||
|
'sphinx.ext.coverage',
|
||||||
|
'sphinx.ext.ifconfig',
|
||||||
|
'sphinx.ext.pngmath',
|
||||||
|
'sphinx.ext.graphviz',
|
||||||
|
'sphinx.ext.todo',
|
||||||
|
'oslosphinx']
|
||||||
|
|
||||||
|
todo_include_todos = True
|
||||||
|
|
||||||
|
# Add any paths that contain templates here, relative to this directory.
|
||||||
|
templates_path = []
|
||||||
|
if os.getenv('HUDSON_PUBLISH_DOCS'):
|
||||||
|
templates_path = ['_ga', '_templates']
|
||||||
|
else:
|
||||||
|
templates_path = ['_templates']
|
||||||
|
|
||||||
|
# The suffix of source filenames.
|
||||||
|
source_suffix = '.rst'
|
||||||
|
|
||||||
|
# The encoding of source files.
|
||||||
|
#source_encoding = 'utf-8'
|
||||||
|
|
||||||
|
# The master toctree document.
|
||||||
|
master_doc = 'index'
|
||||||
|
|
||||||
|
# General information about the project.
|
||||||
|
project = u'Neutron FWaaS'
|
||||||
|
copyright = u'2011-present, OpenStack Foundation.'
|
||||||
|
|
||||||
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
|
# |version| and |release|, also used in various other places throughout the
|
||||||
|
# built documents.
|
||||||
|
#
|
||||||
|
# Version info
|
||||||
|
from neutron_fwaas.version import version_info as neutron_fwaas_version
|
||||||
|
release = neutron_fwaas_version.release_string()
|
||||||
|
# The short X.Y version.
|
||||||
|
version = neutron_fwaas_version.version_string()
|
||||||
|
|
||||||
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
|
# for a list of supported languages.
|
||||||
|
#language = None
|
||||||
|
|
||||||
|
# There are two options for replacing |today|: either, you set today to some
|
||||||
|
# non-false value, then it is used:
|
||||||
|
#today = ''
|
||||||
|
# Else, today_fmt is used as the format for a strftime call.
|
||||||
|
#today_fmt = '%B %d, %Y'
|
||||||
|
|
||||||
|
# List of documents that shouldn't be included in the build.
|
||||||
|
# unused_docs = []
|
||||||
|
|
||||||
|
# List of directories, relative to source directory, that shouldn't be searched
|
||||||
|
# for source files.
|
||||||
|
exclude_trees = []
|
||||||
|
|
||||||
|
# The reST default role (for this markup: `text`) to use for all documents.
|
||||||
|
#default_role = None
|
||||||
|
|
||||||
|
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||||
|
#add_function_parentheses = True
|
||||||
|
|
||||||
|
# If true, the current module name will be prepended to all description
|
||||||
|
# unit titles (such as .. function::).
|
||||||
|
#add_module_names = True
|
||||||
|
|
||||||
|
# If true, sectionauthor and moduleauthor directives will be shown in the
|
||||||
|
# output. They are ignored by default.
|
||||||
|
show_authors = True
|
||||||
|
|
||||||
|
# The name of the Pygments (syntax highlighting) style to use.
|
||||||
|
pygments_style = 'sphinx'
|
||||||
|
|
||||||
|
# A list of ignored prefixes for module index sorting.
|
||||||
|
modindex_common_prefix = ['neutron_fwaas.']
|
||||||
|
|
||||||
|
# -- Options for man page output --------------------------------------------
|
||||||
|
|
||||||
|
# Grouping the document tree for man pages.
|
||||||
|
# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
|
||||||
|
|
||||||
|
#man_pages = [
|
||||||
|
# ('man/neutron-server', 'neutron-server', u'Neutron Server',
|
||||||
|
# [u'OpenStack'], 1)
|
||||||
|
#]
|
||||||
|
|
||||||
|
|
||||||
|
# -- Options for HTML output -------------------------------------------------
|
||||||
|
|
||||||
|
# The theme to use for HTML and HTML Help pages. Major themes that come with
|
||||||
|
# Sphinx are currently 'default' and 'sphinxdoc'.
|
||||||
|
# html_theme_path = ["."]
|
||||||
|
# html_theme = '_theme'
|
||||||
|
|
||||||
|
# Theme options are theme-specific and customize the look and feel of a theme
|
||||||
|
# further. For a list of options available for each theme, see the
|
||||||
|
# documentation.
|
||||||
|
#html_theme_options = {}
|
||||||
|
|
||||||
|
# Add any paths that contain custom themes here, relative to this directory.
|
||||||
|
#html_theme_path = ['_theme']
|
||||||
|
|
||||||
|
# The name for this set of Sphinx documents. If None, it defaults to
|
||||||
|
# "<project> v<release> documentation".
|
||||||
|
#html_title = None
|
||||||
|
|
||||||
|
# A shorter title for the navigation bar. Default is the same as html_title.
|
||||||
|
#html_short_title = None
|
||||||
|
|
||||||
|
# The name of an image file (relative to this directory) to place at the top
|
||||||
|
# of the sidebar.
|
||||||
|
#html_logo = None
|
||||||
|
|
||||||
|
# The name of an image file (within the static path) to use as favicon of the
|
||||||
|
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
|
||||||
|
# pixels large.
|
||||||
|
#html_favicon = None
|
||||||
|
|
||||||
|
# Add any paths that contain custom static files (such as style sheets) here,
|
||||||
|
# relative to this directory. They are copied after the builtin static files,
|
||||||
|
# so a file named "default.css" will overwrite the builtin "default.css".
|
||||||
|
# html_static_path = ['_static']
|
||||||
|
|
||||||
|
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
|
||||||
|
# using the given strftime format.
|
||||||
|
#html_last_updated_fmt = '%b %d, %Y'
|
||||||
|
git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
|
||||||
|
html_last_updated_fmt = os.popen(git_cmd).read()
|
||||||
|
|
||||||
|
# If true, SmartyPants will be used to convert quotes and dashes to
|
||||||
|
# typographically correct entities.
|
||||||
|
#html_use_smartypants = True
|
||||||
|
|
||||||
|
# Custom sidebar templates, maps document names to template names.
|
||||||
|
#html_sidebars = {}
|
||||||
|
|
||||||
|
# Additional templates that should be rendered to pages, maps page names to
|
||||||
|
# template names.
|
||||||
|
#html_additional_pages = {}
|
||||||
|
|
||||||
|
# If false, no module index is generated.
|
||||||
|
#html_use_modindex = True
|
||||||
|
|
||||||
|
# If false, no index is generated.
|
||||||
|
#html_use_index = True
|
||||||
|
|
||||||
|
# If true, the index is split into individual pages for each letter.
|
||||||
|
#html_split_index = False
|
||||||
|
|
||||||
|
# If true, links to the reST sources are added to the pages.
|
||||||
|
#html_show_sourcelink = True
|
||||||
|
|
||||||
|
# If true, an OpenSearch description file will be output, and all pages will
|
||||||
|
# contain a <link> tag referring to it. The value of this option must be the
|
||||||
|
# base URL from which the finished HTML is served.
|
||||||
|
#html_use_opensearch = ''
|
||||||
|
|
||||||
|
# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
|
||||||
|
#html_file_suffix = ''
|
||||||
|
|
||||||
|
# Output file base name for HTML help builder.
|
||||||
|
#htmlhelp_basename = 'neutrondoc'
|
||||||
|
|
||||||
|
|
||||||
|
# -- Options for LaTeX output ------------------------------------------------
|
||||||
|
|
||||||
|
# The paper size ('letter' or 'a4').
|
||||||
|
#latex_paper_size = 'letter'
|
||||||
|
|
||||||
|
# The font size ('10pt', '11pt' or '12pt').
|
||||||
|
#latex_font_size = '10pt'
|
||||||
|
|
||||||
|
# Grouping the document tree into LaTeX files. List of tuples
|
||||||
|
# (source start file, target name, title, author,
|
||||||
|
# documentclass [howto/manual]).
|
||||||
|
#latex_documents = [
|
||||||
|
# ('index', 'Neutron.tex', u'Neutron Documentation',
|
||||||
|
# u'Neutron development team', 'manual'),
|
||||||
|
#]
|
||||||
|
|
||||||
|
# The name of an image file (relative to this directory) to place at the top of
|
||||||
|
# the title page.
|
||||||
|
#latex_logo = None
|
||||||
|
|
||||||
|
# For "manual" documents, if this is true, then toplevel headings are parts,
|
||||||
|
# not chapters.
|
||||||
|
#latex_use_parts = False
|
||||||
|
|
||||||
|
# Additional stuff for the LaTeX preamble.
|
||||||
|
#latex_preamble = ''
|
||||||
|
|
||||||
|
# Documents to append as an appendix to all manuals.
|
||||||
|
#latex_appendices = []
|
||||||
|
|
||||||
|
# If false, no module index is generated.
|
||||||
|
#latex_use_modindex = True
|
|
@ -0,0 +1,17 @@
|
||||||
|
.. documentation master file
|
||||||
|
|
||||||
|
====
|
||||||
|
Main
|
||||||
|
====
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:glob:
|
||||||
|
:maxdepth: 1
|
||||||
|
|
||||||
|
main/*
|
||||||
|
|
||||||
|
==================
|
||||||
|
Indices and tables
|
||||||
|
==================
|
||||||
|
|
||||||
|
* :ref:`search`
|
|
@ -0,0 +1,49 @@
|
||||||
|
Metadata-Version: 1.1
|
||||||
|
Name: neutron-fwaas
|
||||||
|
Version: 2015.1.dev1089.g6f7cb50
|
||||||
|
Summary: OpenStack Networking FWaaS
|
||||||
|
Home-page: http://www.openstack.org/
|
||||||
|
Author: OpenStack
|
||||||
|
Author-email: openstack-dev@lists.openstack.org
|
||||||
|
License: UNKNOWN
|
||||||
|
Description: Welcome!
|
||||||
|
========
|
||||||
|
|
||||||
|
You have come across a cloud computing network fabric controller. It has
|
||||||
|
identified itself as "Neutron." It aims to tame your (cloud) networking!
|
||||||
|
|
||||||
|
External Resources:
|
||||||
|
===================
|
||||||
|
|
||||||
|
The homepage for Neutron is: http://launchpad.net/neutron. Use this
|
||||||
|
site for asking for help, and filing bugs. Code is available on
|
||||||
|
git.openstack.org at <http://git.openstack.org/cgit/openstack/neutron>.
|
||||||
|
|
||||||
|
The latest and most in-depth documentation on how to use Neutron is
|
||||||
|
available at: <http://docs.openstack.org>. This includes:
|
||||||
|
|
||||||
|
Neutron Administrator Guide
|
||||||
|
http://docs.openstack.org/admin-guide-cloud/content/ch_networking.html
|
||||||
|
|
||||||
|
Neutron API Reference:
|
||||||
|
http://docs.openstack.org/api/openstack-network/2.0/content/
|
||||||
|
|
||||||
|
Current Neutron developer documentation is available at:
|
||||||
|
http://wiki.openstack.org/NeutronDevelopment
|
||||||
|
|
||||||
|
For help on usage and hacking of Neutron, please send mail to
|
||||||
|
<mailto:openstack-dev@lists.openstack.org>.
|
||||||
|
|
||||||
|
For information on how to contribute to Neutron, please see the
|
||||||
|
contents of the CONTRIBUTING.rst file.
|
||||||
|
|
||||||
|
|
||||||
|
Platform: UNKNOWN
|
||||||
|
Classifier: Environment :: OpenStack
|
||||||
|
Classifier: Intended Audience :: Information Technology
|
||||||
|
Classifier: Intended Audience :: System Administrators
|
||||||
|
Classifier: License :: OSI Approved :: Apache Software License
|
||||||
|
Classifier: Operating System :: POSIX :: Linux
|
||||||
|
Classifier: Programming Language :: Python
|
||||||
|
Classifier: Programming Language :: Python :: 2
|
||||||
|
Classifier: Programming Language :: Python :: 2.7
|
|
@ -0,0 +1 @@
|
||||||
|
git+https://git.openstack.org/openstack/neutron#egg=neutron
|
|
@ -0,0 +1 @@
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
pbr>=0.6,!=0.7,<1.0
|
||||||
|
Paste
|
||||||
|
PasteDeploy>=1.5.0
|
||||||
|
Routes>=1.12.3,!=2.0
|
||||||
|
anyjson>=0.3.3
|
||||||
|
argparse
|
||||||
|
eventlet>=0.15.2
|
||||||
|
greenlet>=0.3.2
|
||||||
|
httplib2>=0.7.5
|
||||||
|
requests>=2.2.0,!=2.4.0
|
||||||
|
iso8601>=0.1.9
|
||||||
|
jsonrpclib
|
||||||
|
Jinja2>=2.6 # BSD License3 clause
|
||||||
|
keystonemiddleware>=1.0.0
|
||||||
|
netaddr>=0.7.12
|
||||||
|
python-neutronclient>=2.3.6,<3
|
||||||
|
SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
|
||||||
|
WebOb>=1.2.3
|
||||||
|
python-keystoneclient>=0.11.1
|
||||||
|
alembic>=0.6.4
|
||||||
|
six>=1.7.0
|
||||||
|
stevedore>=1.1.0 # Apache-2.0
|
||||||
|
oslo.config>=1.4.0 # Apache-2.0
|
||||||
|
oslo.db>=1.1.0 # Apache-2.0
|
||||||
|
oslo.i18n>=1.0.0 # Apache-2.0
|
||||||
|
oslo.messaging>=1.4.0,!=1.5.0
|
||||||
|
oslo.middleware>=0.1.0 # Apache-2.0
|
||||||
|
oslo.rootwrap>=1.3.0
|
||||||
|
oslo.serialization>=1.0.0 # Apache-2.0
|
||||||
|
oslo.utils>=1.0.0 # Apache-2.0
|
||||||
|
python-novaclient>=2.18.0
|
||||||
|
neutron
|
|
@ -0,0 +1 @@
|
||||||
|
neutron_fwaas
|
|
@ -21,7 +21,8 @@ from oslo.serialization import jsonutils
|
||||||
|
|
||||||
from neutron.i18n import _LE
|
from neutron.i18n import _LE
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils as va_utils
|
from neutron_fwaas.services.firewall.agents.varmour \
|
||||||
|
import varmour_utils as va_utils
|
||||||
|
|
||||||
OPTS = [
|
OPTS = [
|
||||||
cfg.StrOpt('director', default='localhost',
|
cfg.StrOpt('director', default='localhost',
|
||||||
|
|
|
@ -34,9 +34,11 @@ from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.openstack.common import service
|
from neutron.openstack.common import service
|
||||||
from neutron import service as neutron_service
|
from neutron import service as neutron_service
|
||||||
from neutron_fwaas.services.firewall.agents.l3reference import firewall_l3_agent
|
from neutron_fwaas.services.firewall.agents.l3reference \
|
||||||
|
import firewall_l3_agent
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_api
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_api
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils as va_utils
|
from neutron_fwaas.services.firewall.agents.varmour \
|
||||||
|
import varmour_utils as va_utils
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
from neutron.i18n import _LW
|
from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_api
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_api
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils as va_utils
|
from neutron_fwaas.services.firewall.agents.varmour \
|
||||||
|
import varmour_utils as va_utils
|
||||||
from neutron_fwaas.services.firewall.drivers import fwaas_base
|
from neutron_fwaas.services.firewall.drivers import fwaas_base
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -20,11 +20,11 @@ from neutron.common import exceptions as n_exception
|
||||||
from neutron.common import rpc as n_rpc
|
from neutron.common import rpc as n_rpc
|
||||||
from neutron.common import topics
|
from neutron.common import topics
|
||||||
from neutron import context as neutron_context
|
from neutron import context as neutron_context
|
||||||
from neutron_fwaas.db.loadbalancer import firewall_db
|
|
||||||
from neutron.extensions import firewall as fw_ext
|
from neutron.extensions import firewall as fw_ext
|
||||||
from neutron.i18n import _LW
|
from neutron.i18n import _LW
|
||||||
from neutron.openstack.common import log as logging
|
from neutron.openstack.common import log as logging
|
||||||
from neutron.plugins.common import constants as const
|
from neutron.plugins.common import constants as const
|
||||||
|
from neutron_fwaas.db.firewall import firewall_db
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
# Copyright 2011 OpenStack Foundation.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# 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 oslo.config import cfg
|
||||||
|
|
||||||
|
|
||||||
|
cfg.CONF.use_stderr = False
|
|
@ -24,14 +24,14 @@ import webob.exc
|
||||||
from neutron.api import extensions as api_ext
|
from neutron.api import extensions as api_ext
|
||||||
from neutron.common import config
|
from neutron.common import config
|
||||||
from neutron import context
|
from neutron import context
|
||||||
from neutron_fwaas.db.loadbalancer import firewall_db as fdb
|
|
||||||
import neutron.extensions
|
import neutron.extensions
|
||||||
from neutron.extensions import firewall
|
from neutron.extensions import firewall
|
||||||
from neutron import manager
|
from neutron import manager
|
||||||
from neutron.openstack.common import uuidutils
|
from neutron.openstack.common import uuidutils
|
||||||
from neutron.plugins.common import constants
|
from neutron.plugins.common import constants
|
||||||
from neutron_fwaas.services.firewall import fwaas_plugin
|
|
||||||
from neutron.tests.unit import test_db_plugin
|
from neutron.tests.unit import test_db_plugin
|
||||||
|
from neutron_fwaas.db.firewall import firewall_db as fdb
|
||||||
|
from neutron_fwaas.services.firewall import fwaas_plugin
|
||||||
|
|
||||||
|
|
||||||
DB_FW_PLUGIN_KLASS = (
|
DB_FW_PLUGIN_KLASS = (
|
|
@ -25,10 +25,12 @@ from neutron.agent.linux import ip_lib
|
||||||
from neutron.common import config as base_config
|
from neutron.common import config as base_config
|
||||||
from neutron import context
|
from neutron import context
|
||||||
from neutron.plugins.common import constants
|
from neutron.plugins.common import constants
|
||||||
from neutron_fwaas.services.firewall.agents import firewall_agent_api
|
|
||||||
from neutron_fwaas.services.firewall.agents.l3reference import firewall_l3_agent
|
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
from neutron.tests.unit.services.firewall.agents import test_firewall_agent_api
|
from neutron.tests.unit.services.firewall.agents \
|
||||||
|
import test_firewall_agent_api
|
||||||
|
from neutron_fwaas.services.firewall.agents import firewall_agent_api
|
||||||
|
from neutron_fwaas.services.firewall.agents.l3reference \
|
||||||
|
import firewall_l3_agent
|
||||||
|
|
||||||
|
|
||||||
class FWaasHelper(object):
|
class FWaasHelper(object):
|
|
@ -16,9 +16,9 @@
|
||||||
import contextlib
|
import contextlib
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
|
from neutron.tests import base
|
||||||
from neutron_fwaas.services.firewall.agents import firewall_agent_api as api
|
from neutron_fwaas.services.firewall.agents import firewall_agent_api as api
|
||||||
from neutron_fwaas.services.firewall.drivers import fwaas_base as base_driver
|
from neutron_fwaas.services.firewall.drivers import fwaas_base as base_driver
|
||||||
from neutron.tests import base
|
|
||||||
|
|
||||||
|
|
||||||
class NoopFwaasDriver(base_driver.FwaasDriverBase):
|
class NoopFwaasDriver(base_driver.FwaasDriverBase):
|
|
@ -23,9 +23,9 @@ from neutron.agent.linux import interface
|
||||||
from neutron.common import config as base_config
|
from neutron.common import config as base_config
|
||||||
from neutron.common import constants as l3_constants
|
from neutron.common import constants as l3_constants
|
||||||
from neutron.openstack.common import uuidutils
|
from neutron.openstack.common import uuidutils
|
||||||
|
from neutron.tests import base
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils
|
||||||
from neutron.tests import base
|
|
||||||
|
|
||||||
_uuid = uuidutils.generate_uuid
|
_uuid = uuidutils.generate_uuid
|
||||||
HOSTNAME = 'myhost'
|
HOSTNAME = 'myhost'
|
|
@ -17,9 +17,9 @@ import mock
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
|
||||||
from neutron.agent.common import config as a_cfg
|
from neutron.agent.common import config as a_cfg
|
||||||
import neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas as fwaas
|
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
from neutron.tests.unit import test_api_v2
|
from neutron.tests.unit import test_api_v2
|
||||||
|
import neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas as fwaas
|
||||||
|
|
||||||
|
|
||||||
_uuid = test_api_v2._uuid
|
_uuid = test_api_v2._uuid
|
|
@ -23,10 +23,10 @@ from neutron.agent.linux import interface
|
||||||
from neutron.common import config as base_config
|
from neutron.common import config as base_config
|
||||||
from neutron.common import constants as l3_constants
|
from neutron.common import constants as l3_constants
|
||||||
from neutron.openstack.common import uuidutils
|
from neutron.openstack.common import uuidutils
|
||||||
|
from neutron.tests import base
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
|
||||||
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils
|
from neutron_fwaas.services.firewall.agents.varmour import varmour_utils
|
||||||
from neutron_fwaas.services.firewall.drivers.varmour import varmour_fwaas
|
from neutron_fwaas.services.firewall.drivers.varmour import varmour_fwaas
|
||||||
from neutron.tests import base
|
|
||||||
|
|
||||||
_uuid = uuidutils.generate_uuid
|
_uuid = uuidutils.generate_uuid
|
||||||
HOSTNAME = 'myhost'
|
HOSTNAME = 'myhost'
|
|
@ -22,9 +22,9 @@ from webob import exc
|
||||||
from neutron import context
|
from neutron import context
|
||||||
from neutron.extensions import firewall
|
from neutron.extensions import firewall
|
||||||
from neutron.plugins.common import constants as const
|
from neutron.plugins.common import constants as const
|
||||||
from neutron_fwaas.services.firewall import fwaas_plugin
|
|
||||||
from neutron.tests import base
|
from neutron.tests import base
|
||||||
from neutron.tests.unit.db.firewall import test_db_firewall
|
from neutron.tests.unit.db.firewall import test_db_firewall
|
||||||
|
from neutron_fwaas.services.firewall import fwaas_plugin
|
||||||
|
|
||||||
|
|
||||||
FW_PLUGIN_KLASS = (
|
FW_PLUGIN_KLASS = (
|
|
@ -1,19 +0,0 @@
|
||||||
# Copyright 2011 OpenStack Foundation.
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# 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 oslo.config import cfg
|
|
||||||
|
|
||||||
|
|
||||||
cfg.CONF.use_stderr = False
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
# Copyright 2012 OpenStack Foundation.
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# 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 unittest
|
||||||
|
|
||||||
|
|
||||||
|
class FakeTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def test_true(self):
|
||||||
|
self.assertTrue(True)
|
|
@ -0,0 +1,17 @@
|
||||||
|
# Copyright 2011 OpenStack Foundation
|
||||||
|
#
|
||||||
|
# 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 pbr.version
|
||||||
|
|
||||||
|
version_info = pbr.version.VersionInfo('neutron-fwaas')
|
|
@ -1,7 +1,7 @@
|
||||||
[metadata]
|
[metadata]
|
||||||
name = neutron-fwaas
|
name = neutron-fwaas
|
||||||
version = 2015.1
|
version = 2015.1
|
||||||
summary = OpenStack Networking
|
summary = OpenStack Networking FWaaS
|
||||||
description-file =
|
description-file =
|
||||||
README.rst
|
README.rst
|
||||||
author = OpenStack
|
author = OpenStack
|
||||||
|
@ -19,7 +19,7 @@ classifier =
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
packages =
|
packages =
|
||||||
neutron-fwaas
|
neutron_fwaas
|
||||||
data_files =
|
data_files =
|
||||||
etc/neutron =
|
etc/neutron =
|
||||||
etc/fwaas_driver.ini
|
etc/fwaas_driver.ini
|
||||||
|
|
25
tox.ini
25
tox.ini
|
@ -1,5 +1,5 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py27,py33,py34,pep8
|
envlist = py27,py33,py34,pep8,pylint
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
|
@ -9,9 +9,8 @@ skipsdist = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -r requirements.txt -U {opts} {packages}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
|
||||||
whitelist_externals = sh
|
whitelist_externals = sh
|
||||||
commands =
|
commands =
|
||||||
sh tools/pretty_tox.sh '{posargs}'
|
sh tools/pretty_tox.sh '{posargs}'
|
||||||
|
@ -25,18 +24,18 @@ commands =
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
setenv = OS_TEST_PATH=./neutron-fwaas/tests/functional
|
setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
|
||||||
commands =
|
commands =
|
||||||
python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
|
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
|
||||||
[testenv:dsvm-functional]
|
[testenv:dsvm-functional]
|
||||||
setenv = OS_TEST_PATH=./neutron-fwaas/tests/functional
|
setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
|
||||||
OS_SUDO_TESTING=1
|
OS_SUDO_TESTING=1
|
||||||
OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
|
||||||
OS_FAIL_ON_MISSING_DEPS=1
|
OS_FAIL_ON_MISSING_DEPS=1
|
||||||
sitepackages=True
|
sitepackages=True
|
||||||
commands =
|
commands =
|
||||||
python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
|
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -46,16 +45,16 @@ downloadcache = ~/cache/pip
|
||||||
commands =
|
commands =
|
||||||
sh ./tools/check_bash.sh
|
sh ./tools/check_bash.sh
|
||||||
flake8
|
flake8
|
||||||
neutron-db-manage check_migration
|
#neutron-db-manage check_migration
|
||||||
sh -c "find neutron-fwaas -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
|
#sh -c "find neutron-fwaas -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
|
||||||
whitelist_externals = sh
|
whitelist_externals = sh
|
||||||
|
|
||||||
[testenv:i18n]
|
[testenv:i18n]
|
||||||
commands = python ./tools/check_i18n.py ./neutron-fwaas ./tools/i18n_cfg.py
|
commands = python ./tools/check_i18n.py ./neutron_fwaas ./tools/i18n_cfg.py
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
commands =
|
commands =
|
||||||
python -m neutron.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}'
|
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}'
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
@ -85,7 +84,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
pylint
|
pylint
|
||||||
commands =
|
commands =
|
||||||
pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron-fwaas}
|
pylint --rcfile=.pylintrc --output-format=colorized {posargs:neutron_fwaas}
|
||||||
|
|
||||||
[hacking]
|
[hacking]
|
||||||
import_exceptions = neutron.i18n
|
import_exceptions = neutron.i18n
|
||||||
|
|
Loading…
Reference in New Issue