From: Jackie Huang <[email protected]> Removed the patch neutron-test-nec-plugin-extensions-location.patch since the main codes and unit tests of NEC plugin had been removed.
Signed-off-by: Jackie Huang <[email protected]> --- ...utron-test-nec-plugin-extensions-location.patch | 24 ---------------------- .../recipes-devtools/python/python-neutron_git.bb | 7 ++----- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch b/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch deleted file mode 100644 index bf54c79..0000000 --- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch +++ /dev/null @@ -1,24 +0,0 @@ -neutron test: nec plugin extensions location - -Some of the neutron built-in testcases failed -because they can not find nec plugin extensions -based on the given the relative path. - -So forcing these failure testcases to look for -these extensions using absolute path. - -Signed-off-by: Vu Tran <[email protected]> - -diff --git a/neutron/tests/unit/nec/test_nec_plugin.py b/neutron/tests/unit/nec/test_nec_plugin.py -index 2f913ca..1c3f0ce 100644 ---- a/neutron/tests/unit/nec/test_nec_plugin.py -+++ b/neutron/tests/unit/nec/test_nec_plugin.py -@@ -37,7 +37,7 @@ OFC_MANAGER = 'neutron.plugins.nec.nec_plugin.ofc_manager.OFCManager' - NOTIFIER = 'neutron.plugins.nec.nec_plugin.NECPluginV2AgentNotifierApi' - NEC_PLUGIN_INI = """ - [DEFAULT] --api_extensions_path = neutron/plugins/nec/extensions -+api_extensions_path = %PYTHON_SITEPACKAGES_DIR%/neutron/plugins/nec/extensions - [OFC] - driver = neutron.tests.unit.nec.stub_ofc_driver.StubOFCDriver - enable_packet_filter = False diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 1a5a9b2..3c64d61 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -15,14 +15,13 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://metadata_agent.ini \ file://neutron-dhcp-agent-netns-cleanup.cron \ file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ - file://neutron-test-nec-plugin-extensions-location.patch \ " # TBD: update or drop # file://uuid_wscheck.patch -SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" -PV="2015.1.0b2+git${SRCPV}" +SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1" +PV = "2015.1.0b3+git${SRCPV}" S = "${WORKDIR}/git" @@ -137,8 +136,6 @@ do_install_append() { sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin/' ${NEUTRON_CONF_DIR}/neutron.conf cp run_tests.sh ${NEUTRON_CONF_DIR} - - sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py } pkg_postinst_${SRCNAME}-setup () { -- 1.9.1 -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
