Move plugins.necnwa to one more upper directory
plugins directory contains only a single directory 'necnwa' and necnwa LBaaS driver is coming. There is no reason to use a longer name. Change-Id: Id8dc50894c80cd4173953f1a8574d6b42f023f9e
This commit is contained in:
Akihiro Motoki
parent
d70c9b8f7b
commit
ebe2031200
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
import sys
|
||||
|
||||
from networking_nec.plugins.necnwa.agent.nwa_agent import main
|
||||
from networking_nec.nwa.agent import nwa_agent
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
sys.exit(nwa_agent.main())
|
||||
|
|
@ -25,17 +25,17 @@ from oslo_log import log as logging
|
|||
from oslo_service import loopingcall
|
||||
|
||||
from networking_nec._i18n import _LE
|
||||
from networking_nec.plugins.necnwa.agent import proxy_l2
|
||||
from networking_nec.plugins.necnwa.agent import proxy_l3
|
||||
from networking_nec.plugins.necnwa.agent import proxy_tenant
|
||||
from networking_nec.plugins.necnwa.agent import server_manager
|
||||
from networking_nec.plugins.necnwa.common import config
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_agent_callback
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_proxy_callback
|
||||
from networking_nec.plugins.necnwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.plugins.necnwa.l3.rpc import nwa_l3_proxy_callback
|
||||
from networking_nec.plugins.necnwa.nwalib import client as nwa_cli
|
||||
from networking_nec.nwa.agent import proxy_l2
|
||||
from networking_nec.nwa.agent import proxy_l3
|
||||
from networking_nec.nwa.agent import proxy_tenant
|
||||
from networking_nec.nwa.agent import server_manager
|
||||
from networking_nec.nwa.common import config
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.l2.rpc import nwa_agent_callback
|
||||
from networking_nec.nwa.l2.rpc import nwa_proxy_callback
|
||||
from networking_nec.nwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.nwa.l3.rpc import nwa_l3_proxy_callback
|
||||
from networking_nec.nwa.nwalib import client as nwa_cli
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -23,12 +23,12 @@ from oslo_log import log as logging
|
|||
|
||||
from networking_nec._i18n import _LE, _LI, _LW
|
||||
from networking_nec.common import utils
|
||||
from networking_nec.plugins.necnwa.agent import proxy_tenant as tenant_util
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_l2_server_api
|
||||
from networking_nec.plugins.necnwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.plugins.necnwa.nwalib import data_utils
|
||||
from networking_nec.nwa.agent import proxy_tenant as tenant_util
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.l2.rpc import nwa_l2_server_api
|
||||
from networking_nec.nwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.nwa.nwalib import data_utils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -23,14 +23,14 @@ from oslo_log import log as logging
|
|||
|
||||
from networking_nec._i18n import _LE, _LW
|
||||
from networking_nec.common import utils
|
||||
from networking_nec.plugins.necnwa.agent import proxy_l2 as l2
|
||||
from networking_nec.plugins.necnwa.agent import proxy_tenant as tenant_util
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_l2_server_api
|
||||
from networking_nec.plugins.necnwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.plugins.necnwa.l3.rpc import nwa_l3_server_api
|
||||
from networking_nec.plugins.necnwa.nwalib import data_utils
|
||||
from networking_nec.nwa.agent import proxy_l2 as l2
|
||||
from networking_nec.nwa.agent import proxy_tenant as tenant_util
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.l2.rpc import nwa_l2_server_api
|
||||
from networking_nec.nwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.nwa.l3.rpc import nwa_l3_server_api
|
||||
from networking_nec.nwa.nwalib import data_utils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -17,8 +17,8 @@ from oslo_log import log as logging
|
|||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec.common import utils
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.l2.rpc import tenant_binding_api
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.l2.rpc import tenant_binding_api
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ from oslo_log import log as logging
|
|||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec._i18n import _, _LE, _LW
|
||||
from networking_nec.plugins.necnwa.common import config
|
||||
from networking_nec.nwa.common import config
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ from neutron.plugins.ml2 import models as models_ml2
|
|||
import sqlalchemy as sa
|
||||
from sqlalchemy import and_
|
||||
|
||||
from networking_nec.plugins.necnwa.l2 import models as nmodels
|
||||
from networking_nec.nwa.l2 import models as nmodels
|
||||
|
||||
|
||||
class NWATenantBinding(object):
|
||||
|
|
@ -26,12 +26,12 @@ from oslo_config import cfg
|
|||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec._i18n import _LW
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.common import utils as nwa_com_utils
|
||||
from networking_nec.plugins.necnwa.l2 import db_api as nwa_db
|
||||
from networking_nec.plugins.necnwa.l2 import utils as nwa_l2_utils
|
||||
from networking_nec.plugins.necnwa.l3 import db_api as nwa_l3_db
|
||||
from networking_nec.plugins.necnwa.l3.rpc.nwa_l3_proxy_api import NwaL3ProxyApi
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.common import utils as nwa_com_utils
|
||||
from networking_nec.nwa.l2 import db_api as nwa_db
|
||||
from networking_nec.nwa.l2 import utils as nwa_l2_utils
|
||||
from networking_nec.nwa.l3 import db_api as nwa_l3_db
|
||||
from networking_nec.nwa.l3.rpc import nwa_l3_proxy_api
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ class NECNWAMechanismDriver(ovs.OpenvswitchMechanismDriver):
|
|||
def _get_l3api_proxy(self, context, tenant_id):
|
||||
proxy = context._plugin.get_nwa_proxy(tenant_id,
|
||||
context.network._plugin_context)
|
||||
return NwaL3ProxyApi(proxy.client)
|
||||
return nwa_l3_proxy_api.NwaL3ProxyApi(proxy.client)
|
||||
|
||||
def create_port_precommit(self, context):
|
||||
device_owner = context._port['device_owner']
|
||||
|
|
@ -26,13 +26,13 @@ from neutron.plugins.ml2 import plugin as ml2_plugin
|
|||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec._i18n import _LE, _LI, _LW
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.plugins.necnwa.l2 import db_api as necnwa_api
|
||||
from networking_nec.plugins.necnwa.l2.rpc import ml2_server_callback
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_agent_api
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_l2_server_callback
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_proxy_api
|
||||
from networking_nec.plugins.necnwa.l2.rpc import tenant_binding_callback
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.l2 import db_api as necnwa_api
|
||||
from networking_nec.nwa.l2.rpc import ml2_server_callback
|
||||
from networking_nec.nwa.l2.rpc import nwa_agent_api
|
||||
from networking_nec.nwa.l2.rpc import nwa_l2_server_callback
|
||||
from networking_nec.nwa.l2.rpc import nwa_proxy_api
|
||||
from networking_nec.nwa.l2.rpc import tenant_binding_callback
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ from neutron_lib import constants
|
|||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec._i18n import _LW
|
||||
from networking_nec.plugins.necnwa.l2 import db_api as necnwa_api
|
||||
from networking_nec.nwa.l2 import db_api as necnwa_api
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ import oslo_messaging
|
|||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec._i18n import _LI
|
||||
from networking_nec.plugins.necnwa.l2 import db_api as necnwa_api
|
||||
from networking_nec.nwa.l2 import db_api as necnwa_api
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -19,8 +19,8 @@ from neutron_lib import exceptions as n_exc
|
|||
from oslo_log import log as logging
|
||||
from sqlalchemy.orm import exc as sa_exc
|
||||
|
||||
from networking_nec.plugins.necnwa.common import config
|
||||
from networking_nec.plugins.necnwa.common import utils as nwa_com_utils
|
||||
from networking_nec.nwa.common import config
|
||||
from networking_nec.nwa.common import utils as nwa_com_utils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -33,10 +33,10 @@ from oslo_log import helpers
|
|||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec._i18n import _LI, _LW, _LE
|
||||
from networking_nec.plugins.necnwa.common import utils as nwa_com_utils
|
||||
from networking_nec.plugins.necnwa.l2 import db_api as nwa_db
|
||||
from networking_nec.plugins.necnwa.l2 import utils as nwa_l2_utils
|
||||
from networking_nec.plugins.necnwa.l3 import db_api as nwa_l3_db
|
||||
from networking_nec.nwa.common import utils as nwa_com_utils
|
||||
from networking_nec.nwa.l2 import db_api as nwa_db
|
||||
from networking_nec.nwa.l2 import utils as nwa_l2_utils
|
||||
from networking_nec.nwa.l3 import db_api as nwa_l3_db
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -21,9 +21,9 @@ from oslo_log import log as logging
|
|||
import six
|
||||
|
||||
from networking_nec._i18n import _LI, _LW, _LE
|
||||
from networking_nec.plugins.necnwa.nwalib import nwa_restclient
|
||||
from networking_nec.plugins.necnwa.nwalib import semaphore as nwa_sem
|
||||
from networking_nec.plugins.necnwa.nwalib import workflow
|
||||
from networking_nec.nwa.nwalib import nwa_restclient
|
||||
from networking_nec.nwa.nwalib import semaphore as nwa_sem
|
||||
from networking_nec.nwa.nwalib import workflow
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
|
||||
VLAN_OWN_GDV = 'GD'
|
||||
VLAN_OWN_TFW = 'TFW'
|
||||
|
|
@ -20,8 +20,8 @@ from oslo_log import log as logging
|
|||
from oslo_utils import encodeutils
|
||||
|
||||
from networking_nec._i18n import _LI
|
||||
from networking_nec.plugins.necnwa.common import config as nwaconf
|
||||
from networking_nec.plugins.necnwa.nwalib import restclient
|
||||
from networking_nec.nwa.common import config as nwaconf
|
||||
from networking_nec.nwa.nwalib import restclient
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -20,8 +20,8 @@ import requests
|
|||
from six.moves.urllib import parse as urlparse
|
||||
|
||||
from networking_nec._i18n import _, _LI, _LE
|
||||
from networking_nec.plugins.necnwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.nwalib import workflow
|
||||
from networking_nec.nwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.nwa.nwalib import workflow
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -17,7 +17,7 @@ from oslo_log import log as logging
|
|||
import six
|
||||
|
||||
from networking_nec._i18n import _LI
|
||||
from networking_nec.plugins.necnwa.nwalib import workflow
|
||||
from networking_nec.nwa.nwalib import workflow
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -20,7 +20,7 @@ from neutron.tests import base
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec.plugins.necnwa.agent import nwa_agent
|
||||
from networking_nec.nwa.agent import nwa_agent
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ class TestNECNWANeutronAgentBase(base.BaseTestCase):
|
|||
rpc.init(cfg.ConfigOpts())
|
||||
|
||||
def _patch_nwa_client(self):
|
||||
path = 'networking_nec.plugins.necnwa.nwalib.client.NwaClient'
|
||||
path = 'networking_nec.nwa.nwalib.client.NwaClient'
|
||||
patcher = patch(path)
|
||||
self.addCleanup(patcher.stop)
|
||||
cli = patcher.start()
|
||||
|
|
@ -72,7 +72,8 @@ class TestNECNWANeutronAgentAsNwaClient(TestNECNWANeutronAgentBase):
|
|||
|
||||
@patch('neutron.common.rpc.Connection')
|
||||
@patch('neutron.agent.rpc.PluginReportStateAPI')
|
||||
@patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.TenantBindingServerRpcApi') # noqa
|
||||
@patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi')
|
||||
def test__setup_rpc(self, f1, f2, f3):
|
||||
self.agent.setup_rpc()
|
||||
self.assertIsNotNone(self.agent.host)
|
||||
|
|
@ -98,7 +99,7 @@ class TestNECNWANeutronAgentAsNwaClient(TestNECNWANeutronAgentBase):
|
|||
)
|
||||
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.agent.nwa_agent.NECNWANeutronAgent') # noqa
|
||||
@patch('networking_nec.nwa.agent.nwa_agent.NECNWANeutronAgent')
|
||||
@patch('neutron.common.config')
|
||||
@patch('sys.argv')
|
||||
def test_main(f1, f2, f3):
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ from oslo_serialization import jsonutils
|
|||
import six
|
||||
import testscenarios
|
||||
|
||||
from networking_nec.plugins.necnwa.agent import proxy_l2
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.agent import proxy_l2
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.tests.unit.nwa.agent import test_nwa_agent
|
||||
|
||||
load_tests = testscenarios.load_tests_apply_scenarios
|
||||
|
|
@ -167,11 +167,11 @@ class TestAgentProxyL2CreateGeneralDev(
|
|||
),
|
||||
]
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.get_nwa_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.set_nwa_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.agent.proxy_tenant.'
|
||||
@mock.patch('networking_nec.nwa.agent.proxy_tenant.'
|
||||
'AgentProxyTenant.update_tenant_binding')
|
||||
def test_create_general_dev(self, utb, stb, gtb):
|
||||
context = mock.MagicMock()
|
||||
|
|
@ -290,11 +290,11 @@ class TestAgentProxyL2DeleteGeneralDev(
|
|||
),
|
||||
]
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.get_nwa_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.set_nwa_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.agent.proxy_tenant.'
|
||||
@mock.patch('networking_nec.nwa.agent.proxy_tenant.'
|
||||
'AgentProxyTenant.update_tenant_binding')
|
||||
def test_delete_general_dev(self, utb, stb, gtb):
|
||||
context = mock.MagicMock()
|
||||
|
|
@ -374,11 +374,11 @@ class TestNECNWANeutronAgentRpc(test_nwa_agent.TestNECNWANeutronAgentBase):
|
|||
'nwa_info': 'nwa_info_delete_general_dev_succeed3.json'}),
|
||||
]
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.get_nwa_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.agent.proxy_tenant.'
|
||||
@mock.patch('networking_nec.nwa.agent.proxy_tenant.'
|
||||
'AgentProxyTenant.update_tenant_binding')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.'
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi.set_nwa_tenant_binding')
|
||||
def test_general_dev(self, stb, utb, gtb):
|
||||
nwa_tenant_id = "DC_KILO3_5d9c51b1d6a34133bb735d4988b309c2"
|
||||
|
|
@ -394,8 +394,8 @@ class TestNECNWANeutronAgentRpc(test_nwa_agent.TestNECNWANeutronAgentBase):
|
|||
nwa_info = load_data_file(self.nwa_info)
|
||||
|
||||
if getattr(self, 'mock_wait_agent_notifier', False):
|
||||
mock.patch('networking_nec.plugins.necnwa.agent.proxy_l2.'
|
||||
'WAIT_AGENT_NOTIFIER', new=0).start()
|
||||
mock.patch('networking_nec.nwa.agent.proxy_l2.WAIT_AGENT_NOTIFIER',
|
||||
new=0).start()
|
||||
|
||||
if self.mode == 'create_general_dev':
|
||||
rc = self.agent.proxy_l2.create_general_dev(
|
||||
|
|
|
|||
|
|
@ -28,10 +28,11 @@ class TestAgentServerManager(test_nwa_agent.TestNECNWANeutronAgentBase):
|
|||
self.assertEqual(rd['tenant_id'], tenant_id)
|
||||
|
||||
@mock.patch('oslo_messaging.rpc.server.get_rpc_server')
|
||||
@mock.patch('networking_nec.plugins.necnwa.agent.nwa_agent')
|
||||
@mock.patch('networking_nec.nwa.agent.nwa_agent')
|
||||
@mock.patch('neutron.common.rpc.Connection')
|
||||
@mock.patch('neutron.agent.rpc.PluginReportStateAPI')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.rpc.tenant_binding_api.TenantBindingServerRpcApi') # noqa
|
||||
@mock.patch('networking_nec.nwa.l2.rpc.tenant_binding_api.'
|
||||
'TenantBindingServerRpcApi')
|
||||
def test_create_tenant_rpc_server_fail(self, f1, f2, f3, f4, f5):
|
||||
tenant_id = '844eb55f21e84a289e9c22098d387e5d'
|
||||
self.agent.server_manager.rpc_servers[tenant_id] = {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from neutron.tests import base
|
||||
from oslo_log import log as logging
|
||||
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.common import config as cfg
|
||||
from networking_nec.nwa.common import config as cfg
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ from neutron.tests import base
|
|||
from oslo_config import cfg
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec.plugins.necnwa.common import utils as nwa_com_utils
|
||||
from networking_nec.nwa.common import utils as nwa_com_utils
|
||||
|
||||
|
||||
class TestCommonUtils(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ from neutron_lib import constants
|
|||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec.plugins.necnwa.common import config
|
||||
from networking_nec.plugins.necnwa.common import constants as nwa_const
|
||||
from networking_nec.plugins.necnwa.common import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.l2.drivers import mech_necnwa as mech
|
||||
from networking_nec.nwa.common import config
|
||||
from networking_nec.nwa.common import constants as nwa_const
|
||||
from networking_nec.nwa.common import exceptions as nwa_exc
|
||||
from networking_nec.nwa.l2.drivers import mech_necnwa as mech
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
self.context._port['device_owner'] = 'compute:DC01_KVM01_ZONE01'
|
||||
self.driver.create_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_create_port_precommit_tenant_not_found(self, gntb):
|
||||
for device_owner in (constants.DEVICE_OWNER_ROUTER_INTF,
|
||||
constants.DEVICE_OWNER_ROUTER_GW):
|
||||
|
|
@ -206,8 +206,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
self.assertRaises(nwa_exc.TenantNotFound,
|
||||
self.driver.create_port_precommit, self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.add_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.add_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_create_port_precommit_owner_router_intf(self, gntb, antb):
|
||||
self.context._port['device_owner'] = constants.DEVICE_OWNER_ROUTER_INTF
|
||||
gntb.return_value = self.rcode
|
||||
|
|
@ -224,8 +224,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
)
|
||||
self.driver.create_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.add_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.add_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_create_port_precommit_owner_router_gw(self, gntb, antb):
|
||||
self.context._port['device_owner'] = constants.DEVICE_OWNER_ROUTER_GW
|
||||
gntb.return_value = self.rcode
|
||||
|
|
@ -248,7 +248,7 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
self.context._port['device_owner'] = device_owner
|
||||
self.driver.update_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_delete_port_precommit_tenat_not_found(self, gntb):
|
||||
for device_owner in (constants.DEVICE_OWNER_ROUTER_INTF,
|
||||
constants.DEVICE_OWNER_ROUTER_GW):
|
||||
|
|
@ -257,8 +257,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
self.assertRaises(nwa_exc.TenantNotFound,
|
||||
self.driver.delete_port_precommit, self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_delete_port_precommit_owner_router_interface(self, gntb, sntb):
|
||||
self.context._port['device_owner'] = constants.DEVICE_OWNER_ROUTER_INTF
|
||||
gntb.return_value = self.rcode
|
||||
|
|
@ -310,8 +310,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
)
|
||||
self.driver.delete_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_delete_port_precommit_owner_network_floatingip(self, gntb, sntb):
|
||||
self.context._port['device_owner'] = 'network:floatingip'
|
||||
gntb.return_value = self.rcode
|
||||
|
|
@ -355,8 +355,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
)
|
||||
self.driver.delete_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_delete_port_precommit_owner_router_gateway(self, gntb, sntb):
|
||||
router_gw = constants.DEVICE_OWNER_ROUTER_GW
|
||||
self.context._port['device_owner'] = router_gw
|
||||
|
|
@ -373,8 +373,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
)
|
||||
self.driver.delete_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.set_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_delete_port_precommit_owner_compute_az(self, gntb, sntb):
|
||||
# 1 net 1 port(compute:AZ1)
|
||||
self.context.current = self.context._port
|
||||
|
|
@ -412,7 +412,7 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
)
|
||||
self.driver.delete_port_precommit(self.context)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_try_to_bind_segment_for_agent(self, gntb):
|
||||
# in segment
|
||||
self.context._port['device_owner'] = 'network:dhcp'
|
||||
|
|
@ -427,7 +427,7 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
self.context, self.network_segments[1], self.host_agents[1])
|
||||
self.assertEqual(rb, False)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_try_to_bind_segment_for_agent_tenant_not_found(self, gntb):
|
||||
# in segment
|
||||
self.context._port['device_owner'] = 'compute:AZ1'
|
||||
|
|
@ -452,7 +452,7 @@ class TestNECNWAMechanismDriver(TestMechNwa):
|
|||
rb = self.driver._bind_segment_to_vif_type(self.context)
|
||||
self.assertEqual(rb, True)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def _test__bind_port_nwa(self, gntb):
|
||||
# if prov_net.PHYSICAL_NETWORK in self.context.network.current:
|
||||
self.context._port['device_owner'] = constants.DEVICE_OWNER_ROUTER_INTF
|
||||
|
|
|
|||
|
|
@ -17,14 +17,13 @@ from neutron.extensions import portbindings
|
|||
from neutron.tests import base
|
||||
from neutron_lib import constants
|
||||
|
||||
from networking_nec.plugins.necnwa.l2 import plugin
|
||||
from networking_nec.plugins.necnwa.l2.rpc import ml2_server_callback
|
||||
from networking_nec.nwa.l2 import plugin
|
||||
from networking_nec.nwa.l2.rpc import ml2_server_callback
|
||||
|
||||
|
||||
class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._setup_rpc')
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.NECNWAL2Plugin._setup_rpc')
|
||||
@mock.patch('neutron.plugins.ml2.managers.TypeManager.initialize')
|
||||
def setUp(self, f1, f2):
|
||||
super(TestNECNWAServerRpcCallbacks, self).setUp()
|
||||
|
|
@ -59,9 +58,9 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
self.port_context.bottom_bound_segment = mock.MagicMock()
|
||||
self.port_context.current = mock.MagicMock()
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details(self, f1, f2, f3):
|
||||
|
|
@ -77,9 +76,9 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
@mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_no_segment(self, f1, f2, f3, f4, f5, f6):
|
||||
|
|
@ -97,9 +96,9 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
@mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_multi_segment(self, f1, f2, f3, f4, f5, f6):
|
||||
|
|
@ -117,9 +116,9 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
@mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_segment_size_miss_match(self, f1, f2, f3, f4,
|
||||
|
|
@ -136,9 +135,9 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
@mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_segment_zero(self, f1, f2, f3, f4, f5, f6):
|
||||
|
|
@ -154,12 +153,12 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
self.assertIsInstance(device, dict)
|
||||
|
||||
@mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_segment_not_binding(self, f1, f2, f3, f4, f5,
|
||||
|
|
@ -181,14 +180,14 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
"sample"})
|
||||
self.assertTrue(device)
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.update_port_status')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_bound_segment(self, f1, f2, f3, f4, f5,
|
||||
|
|
@ -208,14 +207,14 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
|
|||
kwargs={'test': "sample"})
|
||||
self.assertTrue(device)
|
||||
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.update_port_status')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
|
||||
@mock.patch('neutron.plugins.ml2.db.get_network_segments')
|
||||
@mock.patch('neutron.db.api.get_session')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin.get_bound_port_context')
|
||||
@mock.patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@mock.patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._device_to_port_id')
|
||||
@mock.patch('neutron.manager.NeutronManager.get_plugin')
|
||||
def test_get_device_details_port_state_change(self, f1, f2, f3, f4, f5,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_agent_api
|
||||
from networking_nec.nwa.l2.rpc import nwa_agent_api
|
||||
|
||||
|
||||
class TestNECNWAAgentApi(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_agent_callback
|
||||
from networking_nec.nwa.l2.rpc import nwa_agent_callback
|
||||
|
||||
|
||||
class TestNECNWAAgentRpcCallback(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_proxy_api
|
||||
from networking_nec.nwa.l2.rpc import nwa_proxy_api
|
||||
|
||||
|
||||
class TestNECNWAProxyApi(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.l2.rpc import nwa_proxy_callback
|
||||
from networking_nec.nwa.l2.rpc import nwa_proxy_callback
|
||||
|
||||
|
||||
class TestNECNWAProxyCallback(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ from neutron.tests import base
|
|||
from neutron.tests.unit import testlib_api
|
||||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec.plugins.necnwa.l2 import db_api
|
||||
from networking_nec.nwa.l2 import db_api
|
||||
|
||||
# the below code is required to load test scenarios.
|
||||
# If a test class has 'scenarios' attribute,
|
||||
|
|
@ -303,7 +303,7 @@ class TestSetNwaTenantBinding(base.BaseTestCase):
|
|||
}),
|
||||
]
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_set_nwa_tenant_binding(self, gntb):
|
||||
|
||||
self.session = MagicMock()
|
||||
|
|
@ -342,7 +342,7 @@ class TestDelNwaTenantBinding(base.BaseTestCase):
|
|||
}),
|
||||
]
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.db_api.get_nwa_tenant_binding')
|
||||
@patch('networking_nec.nwa.l2.db_api.get_nwa_tenant_binding')
|
||||
def test_del_nwa_tenant_binding(self, gntb):
|
||||
gntb.return_value = self.old_value_json
|
||||
self.session = MagicMock()
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.l2 import models
|
||||
from networking_nec.nwa.l2 import models
|
||||
|
||||
|
||||
class TestNWATenantKeyValue(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -21,15 +21,14 @@ from neutron.tests import base
|
|||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec.plugins.necnwa.l2 import plugin
|
||||
from networking_nec.nwa.l2 import plugin
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class TestNECNWAL2Plugin(base.BaseTestCase):
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._setup_rpc')
|
||||
@patch('networking_nec.nwa.l2.plugin.NECNWAL2Plugin._setup_rpc')
|
||||
@patch('neutron.plugins.ml2.managers.TypeManager.initialize')
|
||||
def setUp(self, f1, f2):
|
||||
super(TestNECNWAL2Plugin, self).setUp()
|
||||
|
|
@ -94,7 +93,7 @@ class TestNECNWAL2Plugin(base.BaseTestCase):
|
|||
|
||||
@patch('neutron.db.db_base_plugin_common.'
|
||||
'DbBasePluginCommon._make_network_dict')
|
||||
@patch('networking_nec.plugins.necnwa.l2.plugin.'
|
||||
@patch('networking_nec.nwa.l2.plugin.'
|
||||
'NECNWAL2Plugin._extend_network_dict_provider')
|
||||
@patch('neutron.plugins.ml2.plugin.Ml2Plugin.get_network')
|
||||
def test_get_network(self, f1, f2, f3):
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ from neutron_lib import exceptions as n_exc
|
|||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils
|
||||
|
||||
from networking_nec.plugins.necnwa.common import config
|
||||
from networking_nec.plugins.necnwa.l2 import utils as nwa_l2_utils
|
||||
from networking_nec.nwa.common import config
|
||||
from networking_nec.nwa.l2 import utils as nwa_l2_utils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ import mock
|
|||
from neutron.tests import base
|
||||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec.plugins.necnwa.l3.rpc.nwa_l3_proxy_api import NwaL3ProxyApi
|
||||
from networking_nec.nwa.l3.rpc.nwa_l3_proxy_api import NwaL3ProxyApi
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from neutron.common import exceptions as n_exc
|
|||
from neutron.tests import base
|
||||
from oslo_log import log as logging
|
||||
|
||||
from networking_nec.plugins.necnwa.l3.plugin import NECNWAL3Plugin
|
||||
from networking_nec.nwa.l3.plugin import NECNWAL3Plugin
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -50,8 +50,7 @@ class TestNECNWAL3Plugin(base.BaseTestCase):
|
|||
self.assertEqual(rc, 0)
|
||||
|
||||
@patch('neutron.db.l3_db.L3_NAT_db_mixin.update_floatingip')
|
||||
@patch('networking_nec.plugins.necnwa.l3_plugin.NECNWAL3Plugin.'
|
||||
'_delete_nat')
|
||||
@patch('networking_nec.nwa.l3_plugin.NECNWAL3Plugin._delete_nat')
|
||||
@patch('neutron.services.l3_router.l3_router_plugin.'
|
||||
'L3RouterPlugin.update_floatingip')
|
||||
def _test_update_floatingip(self, ufip, ndn, nsn):
|
||||
|
|
|
|||
|
|
@ -15,13 +15,12 @@
|
|||
import mock
|
||||
from mock import MagicMock
|
||||
from mock import patch
|
||||
from neutron.tests import base
|
||||
import testscenarios
|
||||
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.nwalib import client
|
||||
from networking_nec.plugins.necnwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.nwalib import workflow
|
||||
from networking_nec.nwa.nwalib import client
|
||||
from networking_nec.nwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.nwa.nwalib import workflow
|
||||
|
||||
# the below code is required to load test scenarios.
|
||||
# If a test class has 'scenarios' attribute,
|
||||
|
|
@ -81,8 +80,7 @@ class TestNwaClient(TestNwaClientBase):
|
|||
)
|
||||
|
||||
@patch('eventlet.semaphore.Semaphore.locked')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
def test_workflow_kick_and_wait(self, wki, lock):
|
||||
call = MagicMock()
|
||||
call.__name__ = 'POST'
|
||||
|
|
@ -115,8 +113,7 @@ class TestNwaClient(TestNwaClientBase):
|
|||
self.assertIsNone(rd)
|
||||
|
||||
@patch('eventlet.semaphore.Semaphore.locked')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflow_kick_and_wait')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflow_kick_and_wait')
|
||||
def test_call_workflow(self, wkaw, lock):
|
||||
call = MagicMock()
|
||||
call.__name__ = 'POST'
|
||||
|
|
@ -140,7 +137,7 @@ class TestNwaClient(TestNwaClientBase):
|
|||
def test_get_dc_resource_groups(self):
|
||||
self.nwa.get_dc_resource_groups('OpenStack/DC1/Common/Pod2Grp/Pod2')
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.get')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.get')
|
||||
def test_get_workflow_list(self, get):
|
||||
get.return_value = 209, None
|
||||
hst, rd = self.nwa.get_workflow_list()
|
||||
|
|
@ -207,9 +204,8 @@ class TestNwaClient(TestNwaClientBase):
|
|||
)
|
||||
return rt
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.post')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.post')
|
||||
def test_delete_nat(self, post, wki):
|
||||
post.__name__ = 'post'
|
||||
post.return_value = (200, {'status': 'SUCCESS', 'executionid': "01"})
|
||||
|
|
@ -220,9 +216,8 @@ class TestNwaClient(TestNwaClientBase):
|
|||
self.assertEqual(rj['status'], 'SUCCESS')
|
||||
self.assertEqual(post.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.post')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.post')
|
||||
def test_setting_nat(self, post, wki):
|
||||
post.__name__ = 'post'
|
||||
post.return_value = (200, {'status': 'SUCCESS', 'executionid': "01"})
|
||||
|
|
@ -233,9 +228,8 @@ class TestNwaClient(TestNwaClientBase):
|
|||
self.assertEqual(rj['status'], 'SUCCESS')
|
||||
self.assertEqual(post.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.post')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.post')
|
||||
def test_update_tenant_fw(self, post, wki):
|
||||
post.__name__ = 'post'
|
||||
post.return_value = (200, {'status': 'SUCCESS', 'executionid': "01"})
|
||||
|
|
@ -246,9 +240,8 @@ class TestNwaClient(TestNwaClientBase):
|
|||
self.assertEqual(rj['status'], 'SUCCESS')
|
||||
self.assertEqual(post.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.post')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.post')
|
||||
def test_setting_fw_policy(self, post, wki):
|
||||
post.__name__ = 'post'
|
||||
post.return_value = (200, {'status': 'SUCCESS', 'executionid': "01"})
|
||||
|
|
@ -298,9 +291,8 @@ class TestNwaClientScenario(TestNwaClientBase):
|
|||
('test 8', {'count': 4, 'vlan_names': ['cE', 'dE', 'dE', 'dE']}),
|
||||
]
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib'
|
||||
'.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.post')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.workflowinstance')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.post')
|
||||
def test_general_dev(self, post, wki):
|
||||
post.__name__ = 'post'
|
||||
post.return_value = (200, {'status': 'SUCCESS', 'executionid': "01"})
|
||||
|
|
@ -324,8 +316,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
self.nwa = client.NwaClient(load_workflow_list=False)
|
||||
self.tenant_id = 'OpenT9004'
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_create_tenant_nw(self, call_wf):
|
||||
self.nwa.create_tenant_nw(
|
||||
self.tenant_id,
|
||||
|
|
@ -339,8 +330,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'CreateNW_DCResourceGroupName': DC_RESOURCE_GROUP_APP1,
|
||||
'CreateNW_OperationType': 'CreateTenantNW'})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_delete_tenant_nw(self, call_wf):
|
||||
self.nwa.delete_tenant_nw(self.tenant_id)
|
||||
call_wf.assert_called_once_with(
|
||||
|
|
@ -349,8 +339,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
workflow.NwaWorkflow.path('DeleteTenantNW'),
|
||||
{'TenantID': self.tenant_id})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_create_vlan(self, call_wf):
|
||||
vlan_type = 'BusinessVLAN'
|
||||
ipaddr = '10.0.0.0'
|
||||
|
|
@ -371,8 +360,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'CreateNW_VlanType1': vlan_type,
|
||||
'CreateNW_VlanLogicalID1': open_nid})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_delete_vlan(self, call_wf):
|
||||
vlan_name = 'LNW_BusinessVLAN_49'
|
||||
vlan_type = 'BusinessVLAN'
|
||||
|
|
@ -387,8 +375,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'DeleteNW_VlanLogicalName1': vlan_name,
|
||||
'DeleteNW_VlanType1': vlan_type})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_create_tenant_fw(self, call_wf):
|
||||
vlan_devaddr = '10.0.0.254'
|
||||
vlan_name = 'LNW_BusinessVLAN_49'
|
||||
|
|
@ -408,8 +395,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'CreateNW_VlanLogicalName1': vlan_name,
|
||||
'CreateNW_VlanType1': vlan_type})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_update_tenant_fw(self, call_wf):
|
||||
device_name = 'TFW0'
|
||||
device_type = 'TFW'
|
||||
|
|
@ -432,8 +418,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'ReconfigNW_VlanType1': vlan_type,
|
||||
'ReconfigNW_Vlan_ConnectDevice1': 'connect'})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_delete_tenant_fw(self, call_wf):
|
||||
device_name = 'TFW0'
|
||||
device_type = 'TFW'
|
||||
|
|
@ -449,8 +434,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'DeleteNW_DeviceName1': device_name,
|
||||
'DeleteNW_DeviceType1': device_type})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_setting_nat(self, call_wf):
|
||||
fw_name = 'TFW8'
|
||||
vlan_name = 'LNW_PublicVLAN_46'
|
||||
|
|
@ -473,8 +457,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'LocalIP': local_ip,
|
||||
'GlobalIP': global_ip})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_setting_fw_policy(self, call_wf):
|
||||
fw_name = 'TFW8'
|
||||
props = {'properties': [1]}
|
||||
|
|
@ -491,8 +474,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'DeviceInfo': {'Type': 'TFW', 'DeviceName': fw_name},
|
||||
'Property': props})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_delete_nat(self, call_wf):
|
||||
fw_name = 'TFW8'
|
||||
vlan_name = 'LNW_PublicVLAN_46'
|
||||
|
|
@ -517,8 +499,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'LocalIP': local_ip,
|
||||
'GlobalIP': global_ip})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_create_general_dev(self, call_wf):
|
||||
vlan_name = 'LNW_BusinessVLAN_49'
|
||||
vlan_type = 'BusinessVLAN'
|
||||
|
|
@ -539,8 +520,7 @@ class TestUtNwaClient(base.BaseTestCase):
|
|||
'CreateNW_PortType1': port_type,
|
||||
'CreateNW_VlanLogicalID1': 'vlan-logical-id-1'})
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.client.NwaClient.'
|
||||
'call_workflow')
|
||||
@patch('networking_nec.nwa.nwalib.client.NwaClient.call_workflow')
|
||||
def test_delete_general_dev(self, call_wf):
|
||||
vlan_name = 'LNW_BusinessVLAN_49'
|
||||
vlan_type = 'BusinessVLAN'
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.common.config import cfg
|
||||
from networking_nec.plugins.necnwa.nwalib import client
|
||||
from networking_nec.nwa.common.config import cfg
|
||||
from networking_nec.nwa.nwalib import client
|
||||
|
||||
|
||||
CONFIG_FILE_CONTENTS = """
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.nwa.nwalib import exceptions as nwa_exc
|
||||
|
||||
|
||||
class TestNwaException(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ from mock import patch
|
|||
from neutron.tests import base
|
||||
import requests
|
||||
|
||||
from networking_nec.plugins.necnwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.plugins.necnwa.nwalib import restclient
|
||||
from networking_nec.nwa.nwalib import exceptions as nwa_exc
|
||||
from networking_nec.nwa.nwalib import restclient
|
||||
|
||||
|
||||
class TestRestClient(base.BaseTestCase):
|
||||
|
|
@ -74,8 +74,7 @@ class TestRestClient(base.BaseTestCase):
|
|||
def test___report_workflow_error(self):
|
||||
self.rcl._report_workflow_error(None, 0)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.'
|
||||
'rest_api')
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.rest_api')
|
||||
def test_rest_api_return_check(self, ra):
|
||||
body = {'a': 1}
|
||||
url = 'http://127.0.0.5:8085/path'
|
||||
|
|
@ -112,25 +111,25 @@ class TestRestClient(base.BaseTestCase):
|
|||
rcl.rest_api_return_check, 'GET', url, body
|
||||
)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.'
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.'
|
||||
'rest_api_return_check')
|
||||
def test_get(self, rarc):
|
||||
self.rcl.get('')
|
||||
self.assertEqual(rarc.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.'
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.'
|
||||
'rest_api_return_check')
|
||||
def test_post(self, rarc):
|
||||
self.rcl.post('')
|
||||
self.assertEqual(rarc.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.'
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.'
|
||||
'rest_api_return_check')
|
||||
def test_put(self, rarc):
|
||||
self.rcl.put('')
|
||||
self.assertEqual(rarc.call_count, 1)
|
||||
|
||||
@patch('networking_nec.plugins.necnwa.nwalib.restclient.RestClient.'
|
||||
@patch('networking_nec.nwa.nwalib.restclient.RestClient.'
|
||||
'rest_api_return_check')
|
||||
def test_delete(self, rarc):
|
||||
self.rcl.delete('')
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.nwalib import semaphore as nwa_sem
|
||||
from networking_nec.nwa.nwalib import semaphore as nwa_sem
|
||||
|
||||
|
||||
class TestThread(base.BaseTestCase):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import mock
|
||||
from neutron.tests import base
|
||||
|
||||
from networking_nec.plugins.necnwa.nwalib import workflow
|
||||
from networking_nec.nwa.nwalib import workflow
|
||||
|
||||
|
||||
class TestNwaWorkflow(base.BaseTestCase):
|
||||
|
|
@ -57,10 +57,10 @@ class TestNwaWorkflow(base.BaseTestCase):
|
|||
self.assertEqual(rc, '101')
|
||||
|
||||
def test_update_nameid(self):
|
||||
with mock.patch('networking_nec.plugins.necnwa.nwalib.workflow'
|
||||
with mock.patch('networking_nec.nwa.nwalib.workflow'
|
||||
'.NwaWorkflow._nameid',
|
||||
new_callable=mock.PropertyMock) as nameid, \
|
||||
mock.patch('networking_nec.plugins.necnwa.nwalib.workflow'
|
||||
mock.patch('networking_nec.nwa.nwalib.workflow'
|
||||
'.NwaWorkflow._nameid_initialized',
|
||||
new_callable=mock.PropertyMock):
|
||||
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ data_files =
|
|||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
neutron-necnwa-agent = networking_nec.cmd.eventlet.plugins.nwa_agent:main
|
||||
neutron-necnwa-agent = networking_nec.cmd.eventlet.nwa_agent:main
|
||||
neutron.core_plugins =
|
||||
necnwa = networking_nec.plugins.necnwa.l2.plugin:NECNWAL2Plugin
|
||||
necnwa = networking_nec.nwa.l2.plugin:NECNWAL2Plugin
|
||||
neutron.service_plugins =
|
||||
necnwa_router = networking_nec.plugins.necnwa.l3.plugin:NECNWAL3Plugin
|
||||
necnwa_router = networking_nec.nwa.l3.plugin:NECNWAL3Plugin
|
||||
neutron.ml2.mechanism_drivers =
|
||||
necnwa = networking_nec.plugins.necnwa.l2.drivers.mech_necnwa:NECNWAMechanismDriver
|
||||
necnwa = networking_nec.nwa.l2.drivers.mech_necnwa:NECNWAMechanismDriver
|
||||
neutron.db.alembic_migrations =
|
||||
networking-nec = networking_nec.db.migration:alembic_migrations
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue