openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "neutron-lib cleanup in neutron-fwaas"

This commit is contained in:
Jenkins 2016-12-16 00:51:00 +00:00 committed by Gerrit Code Review
parent cad6a7d6fa bc3629645f
commit 9fa1738bd2
3 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_fwaas/db/models/head.py
View File

@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from neutron.db.migration.models import head
from neutron_lib.db import model_base
from neutron_fwaas.db.firewall import firewall_db # noqa
from neutron_fwaas.db.firewall import firewall_router_insertion_db # noqa
@ -18,4 +18,4 @@ from neutron_fwaas.db.firewall.v2 import firewall_db_v2 # noqa
def get_metadata():
return head.model_base.BASEV2.metadata
return model_base.BASEV2.metadata

13
neutron_fwaas/tests/functional/db/test_migrations.py
View File

@ -15,7 +15,6 @@ from oslo_config import cfg
from neutron.db.migration.alembic_migrations import external
from neutron.db.migration import cli as migration
from neutron.tests.functional.db import test_migrations
from neutron.tests.unit import testlib_api
from neutron_fwaas.db.models import head
@ -48,15 +47,3 @@ class _TestModelsMigrationsFWaaS(test_migrations._TestModelsMigrations):
if type_ == 'index' and reflected and name.startswith("idx_autoinc_"):
return False
return True
class TestModelsMigrationsMysql(testlib_api.MySQLTestCaseMixin,
_TestModelsMigrationsFWaaS,
testlib_api.SqlTestCaseLight):
pass
class TestModelsMigrationsPostgresql(testlib_api.PostgreSQLTestCaseMixin,
_TestModelsMigrationsFWaaS,
testlib_api.SqlTestCaseLight):
pass

31
neutron_fwaas/tests/functional/test_fwaas_driver.py
View File

@ -1,31 +0,0 @@
# Copyright (c) 2015 Cisco Systems, Inc.
# 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.
# NOTE: The purpose of this module is to provide a nop test to verify that
# the functional gate is working.
from neutron.tests.functional import base
class TestFWaaSDriver(base.BaseSudoTestCase):
"""Test the iptables implementation of the FWaaS driver."""
# NOTE: Tests may be added/removed/changed, when this is fleshed out
# in future commits.
def test_status_reporting(self):
"""Test status reported correctly to agent."""
pass