Rename neutron-powervm to networking-powervm

As part of the changes outlined here:
https://review.openstack.org/#/c/206658/
https://review.openstack.org/#/c/206662/

Rename neutron-powervm to use the networking-powervm namespace in
accordance with the Neutron Stadium effort.

Change-Id: I445f89b5781647671f2e4daf38a7b60bc58cb686
changes/36/213336/6
adreznec 7 years ago
parent bb7ed35297
commit e2e00a63c0

2
.gitignore vendored

@ -1,7 +1,7 @@
/build/
.testrepository
.tox/
neutron_powervm.egg-info/
networking_powervm.egg-info/
*.pyc
.*.swp
/.idea/

@ -1,4 +1,4 @@
[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_powervm/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:-./networking_powervm/tests/unit} $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

@ -1,5 +1,5 @@
Contributing to Neutron-PowerVM
===============================
Contributing to Networking-PowerVM
==================================
If you would like to contribute to the development of OpenStack,
you must follow the steps in the "If you're a developer, start here"
section of this page:

@ -1,12 +1,12 @@
Neutron-PowerVM Style Commandments
==================================
Networking-PowerVM Style Commandments
=====================================
- Step 1: Read the OpenStack Style Commandments
http://docs.openstack.org/developer/hacking/
- Step 2: Read on
Neutron-PowerVM Specific Commandments
-------------------------------------
Networking-PowerVM Specific Commandments
----------------------------------------
- Follow the Neutron HACKING.rst
Creating Unit Tests

@ -70,7 +70,7 @@ Virtual I/O Servers. The scope of this initial blueprint will limit the
provider network type to VLAN. The actions against the Virtual I/O Servers
will be done via the PowerVM REST API stack via a python wrapper.
This agent will be developed in StackForge under the neutron-powervm project.
This agent will be developed in StackForge under the networking-powervm project.
Keeping in line with the Neutron team goals, this agent is planned to stay
independent of Neutron core, but interlock will be done with the Neutron team
as needed.
@ -169,9 +169,9 @@ Work Items
----------
* Create a PowerVM specific agent package in the
/neutron_powervm/plugins/ibm/agent/powervm/ folder. Stub out the methods.
/networking_powervm/plugins/ibm/agent/powervm/ folder. Stub out the methods.
* Create a PowerVM mechanism driver in /neutron_powervm/ml2/drivers/.
* Create a PowerVM mechanism driver in /networking_powervm/ml2/drivers/.
* Create a baseline ini file that provides information needed to bring up the
agent and map it to provider networks.

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# neutron-powervm documentation build configuration file, created by
# networking-powervm documentation build configuration file, created by
# sphinx-quickstart on Tue Feb 3 09:06:25 2015.
#
# This file is execfile()d with the current directory set to its
@ -46,18 +46,18 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'neutron-powervm'
project = u'networking-powervm'
copyright = u'2015, IBM'
# 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.
#
import neutron_powervm.version
import networking_powervm.version
# The short X.Y version.
version = neutron_powervm.version.version_info.version_string()
version = networking_powervm.version.version_info.version_string()
# The full version, including alpha/beta/rc tags.
release = neutron_powervm.version.version_info.release_string()
release = networking_powervm.version.version_info.release_string()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

@ -18,7 +18,7 @@ Setting Up a Development Environment
====================================
This page describes how to setup a working Python development
environment that can be used in developing neutron-powervm.
environment that can be used in developing networking-powervm.
These instructions assume you're already familiar with
Git and Gerrit, which is a code repository mirror and code review toolset,
@ -34,8 +34,8 @@ Getting the code
Grab the code::
git clone git://git.openstack.org/stackforge/neutron-powervm
cd neutron-powervm
git clone git://git.openstack.org/openstack/networking-powervm
cd networking-powervm
Setting up your environment
---------------------------

@ -18,8 +18,8 @@ Developer Guide
===============
In the Developer Guide, you will find information on how to develop for
Neutron-PowerVM and how it interacts with Neutron. You will also find
information on setup and usage of Neutron-PowerVM.
Networking-PowerVM and how it interacts with Neutron. You will also find
information on setup and usage of Networking-PowerVM.
Internals and Programming

@ -14,16 +14,16 @@
License for the specific language governing permissions and limitations
under the License.
Running Neutron-PowerVM Tests
=============================
Running Networking-PowerVM Tests
================================
This page describes how to run the Neutron-PowerVM tests. This page assumes you
have already set up an working Python environment for Neutron-PowerVM development.
This page describes how to run the Networking-PowerVM tests. This page assumes you
have already set up an working Python environment for Networking-PowerVM development.
With `tox`
~~~~~~~~~~
Neutron-PowerVM, like other OpenStack projects, uses `tox`_ for managing the virtual
Networking-PowerVM, like other OpenStack projects, uses `tox`_ for managing the virtual
environments for running test cases. It uses `Testr`_ for managing the running
of the test cases.
@ -47,7 +47,7 @@ PEP8 and Unit Tests
+++++++++++++++++++
Running pep8 and unit tests is as easy as executing this in the root
directory of the Neutron-PowerVM source code::
directory of the Networking-PowerVM source code::
tox

@ -19,4 +19,4 @@ Usage
.. todo::
Add in steps for basic usage of neutron-powervm
Add in steps for basic usage of networking-powervm

@ -14,8 +14,8 @@
License for the specific language governing permissions and limitations
under the License.
Welcome to neutron-powervm's documentation!
===========================================
Welcome to networking-powervm's documentation!
==============================================
This project will provide an ML2 compatible agent for PowerVM Shared
Ethernet Adapter integration with OpenStack Neutron.
@ -24,8 +24,8 @@ Documentation on Neutron can be found at the `Neutron Devref`_.
.. _`Neutron Devref`: http://docs.openstack.org/developer/neutron/devref
Neutron-PowerVM Policies
========================
Networking-PowerVM Policies
===========================
Contents:
@ -34,8 +34,8 @@ Contents:
policies/index
Neutron-PowerVM Devref
======================
Networking-PowerVM Devref
=========================
Contents:

@ -1,8 +1,8 @@
Neutron-PowerVM Bugs
====================
Networking-PowerVM Bugs
=======================
Neutron-PowerVM maintains all of its bugs in `Launchpad <https://bugs.launchpad.net/neutron-powervm>`_.
All of the current open Neutron-PowerVM bugs can be found in that link.
Networking-PowerVM maintains all of its bugs in `Launchpad <https://bugs.launchpad.net/neutron-powervm>`_.
All of the current open Networking-PowerVM bugs can be found in that link.
Bug Triage Process
------------------

@ -7,7 +7,7 @@ onboarding of contributions from new contributors.
Code Review Practices
---------------------
Neutron-PowerVM follows the `code review guidelines <https://wiki.openstack.org/wiki/ReviewChecklist>`_ as
Networking-PowerVM follows the `code review guidelines <https://wiki.openstack.org/wiki/ReviewChecklist>`_ as
set forth for all OpenStack projects. It is expected that all reviewers are following the guidelines
set forth on that page.

@ -14,11 +14,11 @@
License for the specific language governing permissions and limitations
under the License.
Neutron-PowerVM Policies
========================
Networking-PowerVM Policies
===========================
In the Policies Guide, you will find documented policies for developing with
Neutron-PowerVM. This includes the processes we use for blueprints and specs,
Networking-PowerVM. This includes the processes we use for blueprints and specs,
bugs, contributor onboarding, and other procedural items.
Policies

@ -18,6 +18,6 @@ import six
if six.PY2:
gettext.install('neutron-powervm', unicode=1)
gettext.install('networking-powervm', unicode=1)
else:
gettext.install('neutron-powervm')
gettext.install('networking-powervm')

@ -34,7 +34,7 @@ from pypowervm.helpers import log_helper as log_hlp
from pypowervm.helpers import vios_busy as vio_hlp
from pypowervm.utils import uuid as pvm_uuid
from neutron_powervm.plugins.ibm.agent.powervm import utils
from networking_powervm.plugins.ibm.agent.powervm import utils
import time

@ -32,7 +32,7 @@ from neutron.common import topics
from neutron import context as ctx
from neutron.i18n import _, _LE, _LI
from neutron_powervm.plugins.ibm.agent.powervm import constants as p_const
from networking_powervm.plugins.ibm.agent.powervm import constants as p_const
import sys
import time
@ -108,7 +108,7 @@ class FakeSharedEthernetNeutronAgent(object):
# Define the baseline agent_state that will be reported back for the
# health status
self.agent_state = {
'binary': 'neutron-powervm-sharedethernet-agent',
'binary': 'networking-powervm-sharedethernet-agent',
'host': cfg.CONF.host,
'topic': q_const.L2_AGENT_TOPIC,
'configurations': {},

@ -27,9 +27,9 @@ from neutron.common import config as n_config
from neutron.i18n import _LW, _LE, _LI
from pypowervm.tasks import network_bridger as net_br
from neutron_powervm.plugins.ibm.agent.powervm import agent_base
from neutron_powervm.plugins.ibm.agent.powervm import constants as p_const
from neutron_powervm.plugins.ibm.agent.powervm import utils
from networking_powervm.plugins.ibm.agent.powervm import agent_base
from networking_powervm.plugins.ibm.agent.powervm import constants as p_const
from networking_powervm.plugins.ibm.agent.powervm import utils
import sys
@ -208,7 +208,7 @@ class SharedEthernetNeutronAgent(agent_base.BasePVMNeutronAgent):
def __init__(self):
"""Constructs the agent."""
name = 'neutron-powervm-sharedethernet-agent'
name = 'networking-powervm-sharedethernet-agent'
agent_type = p_const.AGENT_TYPE_PVM_SEA
super(SharedEthernetNeutronAgent, self).__init__(name, agent_type)

@ -26,7 +26,7 @@ from pypowervm.wrappers import managed_system as pvm_ms
from pypowervm.wrappers import network as pvm_net
from pypowervm.wrappers import virtual_io_server as pvm_vios
from neutron_powervm.plugins.ibm.agent.powervm import exceptions as np_exc
from networking_powervm.plugins.ibm.agent.powervm import exceptions as np_exc
LOG = logging.getLogger(__name__)

@ -23,7 +23,7 @@ from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import mech_agent
from neutron.plugins.ml2 import rpc
from neutron_powervm.plugins.ibm.agent.powervm import constants as pconst
from networking_powervm.plugins.ibm.agent.powervm import constants as pconst
LOG = log.getLogger(__name__)

@ -1,5 +1,5 @@
INFO{
{'comment': 'Created for neutron-powervm unit tests', 'status': 200, 'pw': 'abc123', 'reason': 'OK', 'host': '9.1.2.3', 'user': 'hscroot', 'path': 'LogicalPartition'}
{'comment': 'Created for networking-powervm unit tests', 'status': 200, 'pw': 'abc123', 'reason': 'OK', 'host': '9.1.2.3', 'user': 'hscroot', 'path': 'LogicalPartition'}
END OF SECTION}
HEADERS{
{'x-powered-by': 'Servlet/3.0', 'transfer-encoding': 'chunked', 'set-cookie': 'JSESSIONID=00002EyMEecWDIzdx_K0LwQNiUO:aa95eb5b-d145-4cd8-9030-8b370106cfee; Path=/; HttpOnly', 'expires': 'Thu, 01 Jan 1970 00:00:00 GMT', 'last-modified': 'Fri, 16 Aug 2013 09:49:34 GMT', 'etag': '959374938', 'cache-control': 'no-transform, must-revalidate, proxy-revalidate, no-cache=set-cookie', 'date': 'Fri, 16 Aug 2013 09:49:40 GMT', 'content-type': 'application/atom+xml'}

@ -19,8 +19,8 @@ import mock
from oslo_config import cfg
from pypowervm.tests import test_fixtures as pvm_fx
from neutron_powervm.plugins.ibm.agent.powervm import agent_base
from neutron_powervm.tests.unit.plugins.ibm.powervm import base
from networking_powervm.plugins.ibm.agent.powervm import agent_base
from networking_powervm.tests.unit.plugins.ibm.powervm import base
class FakeExc(Exception):
@ -42,9 +42,9 @@ class TestAgentBase(base.BasePVMTestCase):
self.adpt = self.useFixture(
pvm_fx.AdapterFx(traits=pvm_fx.LocalPVMTraits)).adpt
with mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
'BasePVMNeutronAgent.setup_adapter'),\
mock.patch('neutron_powervm.plugins.ibm.agent.powervm.'
with mock.patch('networking_powervm.plugins.ibm.agent.powervm.'
'agent_base.BasePVMNeutronAgent.setup_adapter'),\
mock.patch('networking_powervm.plugins.ibm.agent.powervm.'
'agent_base.BasePVMNeutronAgent.setup_rpc'):
agent = agent_base.BasePVMNeutronAgent('binary_name', 'agent_type')
agent.context = mock.Mock()
@ -53,9 +53,9 @@ class TestAgentBase(base.BasePVMTestCase):
agent.adapter = self.adpt
return agent
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.agent_base.'
'build_prov_requests')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.agent_base.'
'BasePVMNeutronAgent.provision_devices')
def test_attempt_provision(self, mock_provision,
mock_build_prov_requests):
@ -76,11 +76,11 @@ class TestAgentBase(base.BasePVMTestCase):
for net_dev in devs:
self.assertFalse(net_dev.called)
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.agent_base.'
'build_prov_requests')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.agent_base.'
'BasePVMNeutronAgent.update_device_down')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.agent_base.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.agent_base.'
'BasePVMNeutronAgent.provision_devices')
def test_attempt_provision_failure(self, mock_provision, mock_dev_down,
mock_build_prov_requests):

@ -18,8 +18,8 @@ from oslo_config import cfg
import mock
from neutron_powervm.plugins.ibm.agent.powervm import sea_agent
from neutron_powervm.tests.unit.plugins.ibm.powervm import base
from networking_powervm.plugins.ibm.agent.powervm import sea_agent
from networking_powervm.tests.unit.plugins.ibm.powervm import base
from pypowervm.tests import test_fixtures as pvm_fx
from neutron.common import constants as q_const
@ -66,22 +66,22 @@ class SEAAgentTest(base.BasePVMTestCase):
self.adpt = self.useFixture(
pvm_fx.AdapterFx(traits=pvm_fx.LocalPVMTraits)).adpt
with mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
with mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'get_host_uuid'),\
mock.patch('neutron_powervm.plugins.ibm.agent.'
mock.patch('networking_powervm.plugins.ibm.agent.'
'powervm.utils.parse_sea_mappings'):
self.agent = sea_agent.SharedEthernetNeutronAgent()
self.agent.adapter = self.adpt
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'parse_sea_mappings')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'get_host_uuid')
def test_init(self, mock_get_host_uuid, mock_parse_mapping):
"""Verifies the integrity of the agent after being initialized."""
mock_get_host_uuid.return_value = 'host_uuid'
temp_agent = sea_agent.SharedEthernetNeutronAgent()
self.assertEqual('neutron-powervm-sharedethernet-agent',
self.assertEqual('networking-powervm-sharedethernet-agent',
temp_agent.agent_state.get('binary'))
self.assertEqual(q_const.L2_AGENT_TOPIC,
temp_agent.agent_state.get('topic'))
@ -126,7 +126,7 @@ class SEAAgentTest(base.BasePVMTestCase):
self.assertIsNone(self.agent.agent_state.get('start_flag'))
@mock.patch('pypowervm.tasks.network_bridger.ensure_vlans_on_nb')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils')
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils')
def test_provision_devices(self, mock_utils, mock_ensure):
"""Validates that the provision is invoked with batched VLANs."""
self.agent.api_utils = mock_utils
@ -145,7 +145,7 @@ class SEAAgentTest(base.BasePVMTestCase):
self.assertEqual(2, self.agent.pvid_updater.add.call_count)
@mock.patch('pypowervm.tasks.network_bridger.ensure_vlans_on_nb')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils')
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils')
def test_provision_devices_fails(self, mock_utils, mock_ensure):
"""Validates that behavior of a failed VLAN provision."""
self.agent.api_utils = mock_utils
@ -170,11 +170,12 @@ class SEAAgentTest(base.BasePVMTestCase):
@mock.patch('pypowervm.tasks.network_bridger.remove_vlan_from_nb')
@mock.patch('pypowervm.tasks.network_bridger.ensure_vlans_on_nb')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'get_vswitch_map')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.list_cnas')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.list_bridges')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.list_cnas')
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_bridges')
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'find_nb_for_cna')
def test_heal_and_optimize(self, mock_find_nb_for_cna, mock_list_bridges,
mock_list_cnas, mock_vs_map, mock_nbr_ensure,
@ -252,13 +253,13 @@ class PVIDLooperTest(base.BasePVMTestCase):
self.looper.add(req)
self.assertEqual(1, len(self.looper.requests))
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_lpar_uuids')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_cnas')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'update_cna_pvid')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'find_cna_for_mac')
def test_update(self, mock_find_cna_for_mac, mock_update_cna_pvid,
mock_list_cnas, mock_uuids):
@ -284,9 +285,9 @@ class PVIDLooperTest(base.BasePVMTestCase):
self.assertFalse(self.mock_agent.update_device_down.called)
self.assertTrue(self.mock_agent.update_device_up.called)
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_lpar_uuids')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_cnas')
def test_update_no_lpar(self, mock_list_cnas, mock_uuids):
req = sea_agent.UpdateVLANRequest(FakeNPort('a', 27, 'phys_net'))
@ -302,11 +303,11 @@ class PVIDLooperTest(base.BasePVMTestCase):
self.assertEqual(1, len(self.looper.requests))
self.assertFalse(mock_list_cnas.called)
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_lpar_uuids')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_cnas')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'find_cna_for_mac')
def test_update_err(self, mock_find_cna_for_mac, mock_list_cnas,
mock_list_lpar_uuids):

@ -16,10 +16,10 @@
import mock
from neutron_powervm.plugins.ibm.agent.powervm import exceptions as np_exc
from neutron_powervm.plugins.ibm.agent.powervm import utils
from networking_powervm.plugins.ibm.agent.powervm import exceptions as np_exc
from networking_powervm.plugins.ibm.agent.powervm import utils
from neutron_powervm.tests.unit.plugins.ibm.powervm import base
from networking_powervm.tests.unit.plugins.ibm.powervm import base
import os
@ -155,7 +155,7 @@ class UtilsTest(base.BasePVMTestCase):
resp = utils.find_nb_for_cna(nb_wraps, mock_client_adpt, vswitch_map)
self.assertIsNone(resp)
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'_list_vm_entries')
@mock.patch('pypowervm.wrappers.network.CNA.wrap')
def test_list_cnas(self, mock_cna_wrap, mock_list_vms):
@ -179,7 +179,7 @@ class UtilsTest(base.BasePVMTestCase):
cnas = utils.list_cnas(self.adpt, 'host_uuid')
self.assertEqual(1, len(cnas))
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_bridges')
def test_parse_sea_mappings(self, mock_list_br):
nb_wraps = pvm_net.NetBridge.wrap(self.net_br_resp)
@ -194,7 +194,7 @@ class UtilsTest(base.BasePVMTestCase):
self.assertEqual('764f3423-04c5-3b96-95a3-4764065400bd',
resp['default'])
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_bridges')
def test_parse_sea_mappings_no_bridges(self, mock_list_br):
mock_list_br.return_value = []
@ -202,7 +202,7 @@ class UtilsTest(base.BasePVMTestCase):
self.assertRaises(np_exc.NoNetworkBridges, utils.parse_sea_mappings,
self.adpt, 'host_uuid', '1:2:3')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_bridges')
def test_parse_sea_mappings_no_mapping(self, mock_list_br):
nb_wraps = pvm_net.NetBridge.wrap(self.net_br_resp)
@ -215,9 +215,9 @@ class UtilsTest(base.BasePVMTestCase):
self.assertEqual({'default': '764f3423-04c5-3b96-95a3-4764065400bd'},
resp)
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'_parse_empty_bridge_mapping')
@mock.patch('neutron_powervm.plugins.ibm.agent.powervm.utils.'
@mock.patch('networking_powervm.plugins.ibm.agent.powervm.utils.'
'list_bridges')
def test_parse_call_to_empty_bridge(self, mock_list_br, mock_empty):
nb_wraps = pvm_net.NetBridge.wrap(self.net_br_resp)

@ -16,8 +16,8 @@
import mock
from neutron_powervm.plugins.ml2.drivers import mech_pvm_sea as m_pvm
from neutron_powervm.tests.unit.plugins.ibm.powervm import base
from networking_powervm.plugins.ml2.drivers import mech_pvm_sea as m_pvm
from networking_powervm.tests.unit.plugins.ibm.powervm import base
from neutron.plugins.ml2 import driver_api as api

@ -1,4 +1,4 @@
[DEFAULT]
# The base module to hold the copy of openstack.common
base=neutron_powervm
base=networking_powervm

@ -1,5 +1,5 @@
[metadata]
name = neutron-powervm
name = networking-powervm
summary = PowerVM Neutron ML2 Agent for OpenStack Neutron.
description-file = README.rst
author = IBM
@ -19,12 +19,12 @@ classifier =
[entry_points]
console_scripts =
neutron-powervm-sea-agent = neutron_powervm.plugins.ibm.agent.powervm.sea_agent:main
networking-powervm-sea-agent = networking_powervm.plugins.ibm.agent.powervm.sea_agent:main
neutron.ml2.mechanism_drivers =
pvm_sea = neutron_powervm.plugins.ml2.drivers.mech_pvm_sea:PvmSEAMechanismDriver
pvm_sea = networking_powervm.plugins.ml2.drivers.mech_pvm_sea:PvmSEAMechanismDriver
[files]
packages = neutron_powervm
packages = networking_powervm
[build_sphinx]
all_files = 1
@ -32,15 +32,15 @@ source-dir = doc/source
build-dir = doc/build
[compile_catalog]
directory = neutron_powervm/locale
domain = neutron-powervm
directory = networking_powervm/locale
domain = networking-powervm
[update_catalog]
domain = neutron-powervm
output_dir = neutron_powervm/locale
input_file = neutron_powervm/locale/neutron-powervm.pot
domain = networking-powervm
output_dir = networking_powervm/locale
input_file = networking_powervm/locale/networking-powervm.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = neutron_powervm/locale/neutron-powervm.pot
output_file = networking_powervm/locale/networking-powervm.pot

@ -1,6 +1,6 @@
# Required metadata
sonar.projectKey=org.codehaus.sonar:neutron-powervm
sonar.projectName=neutron-powervm
sonar.projectKey=org.codehaus.sonar:networking-powervm
sonar.projectName=networking-powervm
sonar.projectVersion=1.0
# Comma-separated paths to directories with sources (required)

@ -24,12 +24,12 @@ commands =
setenv = VIRTUAL_ENV={envdir}
[testenv:functional]
setenv = OS_TEST_PATH=./neutron_powervm/tests/functional
setenv = OS_TEST_PATH=./networking_powervm/tests/functional
commands =
python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
[testenv:dsvm-functional]
setenv = OS_TEST_PATH=./neutron_powervm/tests/functional
setenv = OS_TEST_PATH=./networking_powervm/tests/functional
OS_SUDO_TESTING=1
OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
OS_FAIL_ON_MISSING_DEPS=1

Loading…
Cancel
Save