# HG changeset patch # User Laszlo Peter # Date 1473284917 25200 # Node ID 92d993615297e0fc446c2c2063236c6060f16680 # Parent 880d266856d22eec3fef7915bb0d8f925f001fe3 23116133 Upgrade neutronclient to 4.1.2 diff -r 880d266856d2 -r 92d993615297 components/python/neutronclient/Makefile --- a/components/python/neutronclient/Makefile Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/neutronclient/Makefile Wed Sep 07 14:48:37 2016 -0700 @@ -26,16 +26,17 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= python-neutronclient -COMPONENT_VERSION= 2.4.0 +COMPONENT_VERSION= 4.1.2 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:4c5c3a79216c682926f75ffd8db5f4338525a643ea02de37df7bf82a1e486b28 + sha256:9686417fa44629f31e3ad0a07f179fae4615ae23bd91f9352ab9caa83c0c2422 COMPONENT_ARCHIVE_URL= $(call pypi_url) -COMPONENT_PROJECT_URL= http://launchpad.net/python-neutronclient +COMPONENT_PROJECT_URL= \ + http://docs.openstack.org/developer/python-neutronclient/ COMPONENT_BUGDB= service/neutron -TPNO= 25755 +TPNO= 31339 # Depends on netaddr which is not Python 3 ready. PYTHON_VERSIONS= $(PYTHON2_VERSIONS) @@ -47,19 +48,15 @@ ASLR_MODE = $(ASLR_NOT_APPLICABLE) COMPONENT_POST_INSTALL_ACTION = \ - (cd $(PROTO_DIR)/usr/bin ; $(MV) -f neutron neutron-$(PYTHON_VERSION)) + (cd $(PROTO_DIR)/usr/bin ; $(MV) -f neutron neutron-$(PYTHON_VERSION)) # common targets build: $(BUILD_NO_ARCH) install: $(INSTALL_NO_ARCH) -# -# Tests require: -# hacking, cliff-tablib, discover, fixtures, mox, python-subunit, -# sphinx, testrepository, testtools -# which haven't been integrated yet. -# +# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules +# required to execute unittests. test: $(NO_TESTS) -system-test: $(NO_TESTS) +system-test: $(NO_TESTS) diff -r 880d266856d2 -r 92d993615297 components/python/neutronclient/neutronclient-PYVER.p5m --- a/components/python/neutronclient/neutronclient-PYVER.p5m Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/neutronclient/neutronclient-PYVER.p5m Wed Sep 07 14:48:37 2016 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -46,10 +46,10 @@ mediator-version=$(PYVER) file path=usr/bin/neutron-$(PYVER) file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/_i18n.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/client.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/clientmanager.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/command.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/constants.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/exceptions.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/common/extension.py @@ -60,12 +60,22 @@ file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/client.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/address_scope.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/agent.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/agentscheduler.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/auto_allocated_topology.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/availability_zone.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/bgp/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/bgp/dragentscheduler.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/bgp/peer.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/bgp/speaker.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/contrib/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/contrib/_fox_sockets.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/credential.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/dns.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/extension.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/flavor/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/flavor/flavor.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/flavor/flavor_profile.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/floatingip.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/fw/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/fw/firewall.py @@ -77,29 +87,35 @@ file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/pool.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/healthmonitor.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/l7policy.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/l7rule.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/listener.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/member.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/v2/pool.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/vip.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/metering.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nec/__init__.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nec/packetfilter.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/netpartition.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/network.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/networkprofile.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/network_ip_availability.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/networkgateway.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/qos_queue.py -file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/policyprofile.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/port.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/purge.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/qos/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/qos/bandwidth_limit_rule.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/qos/policy.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/qos/rule.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/quota.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/rbac.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/router.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/securitygroup.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/servicetype.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/subnet.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/subnetpool.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/tag.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/endpoint_group.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/ikepolicy.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/ipsecpolicy.py @@ -120,18 +136,16 @@ # license neutronclient.license license="Apache v2.0" -# force a dependency on argparse; pkgdepend work is needed to flush this out. -depend type=require fmri=library/python/argparse-$(PYV) - # force a dependency on cliff; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/cliff-$(PYV) -# force a dependency on iso8601; pkgdepend work is needed to flush this out. -depend type=require fmri=library/python/iso8601-$(PYV) +# force a dependency on debtcollector; pkgdepend work is needed to flush this +# out. +depend type=require fmri=library/python/debtcollector-$(PYV) -# force a dependency on keystoneclient; pkgdepend work is needed to flush this +# force a dependency on keystoneauth1; pkgdepend work is needed to flush this # out. -depend type=require fmri=library/python/keystoneclient-$(PYV) +depend type=require fmri=library/python/keystoneauth1-$(PYV) # force a dependency on netaddr; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/netaddr-$(PYV) @@ -140,6 +154,10 @@ depend type=require \ fmri=library/python/neutronclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +# force a dependency on os-client-config; pkgdepend work is needed to flush this +# out. +depend type=require fmri=library/python/os-client-config-$(PYV) + # force a dependency on oslo.i18n; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/oslo.i18n-$(PYV) @@ -156,8 +174,8 @@ # force a dependency on requests; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/requests-$(PYV) -# force a dependency on simplejson; pkgdepend work is needed to flush this out. -depend type=require fmri=library/python/simplejson-$(PYV) - # force a dependency on six; pkgdepend work is needed to flush this out. depend type=require fmri=library/python/six-$(PYV) + +# force a dependency on stevedore; pkgdepend work is needed to flush this out. +depend type=require fmri=library/python/stevedore-$(PYV) diff -r 880d266856d2 -r 92d993615297 components/python/neutronclient/neutronclient.license --- a/components/python/neutronclient/neutronclient.license Wed Sep 07 14:48:37 2016 -0700 +++ b/components/python/neutronclient/neutronclient.license Wed Sep 07 14:48:37 2016 -0700 @@ -8,7 +8,7 @@ See the License for the specific language governing permissions and limitations under the License. - Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -182,30 +182,3 @@ defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff -r 880d266856d2 -r 92d993615297 components/python/neutronclient/patches/01-requirements.patch --- a/components/python/neutronclient/patches/01-requirements.patch Wed Sep 07 14:48:37 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -In-house patch to remove the dependency on argparse. Since we use -Python 2.7 only for OpenStack, argparse is already included. If this -line is present, stevedore will fail to find the pip package for it, -causing a cascade of failures to other tools. - ---- python-neutronclient-2.4.0/requirements.txt.orig 2015-10-19 23:03:48.182019198 -0400 -+++ python-neutronclient-2.4.0/requirements.txt 2015-10-19 23:06:30.741731889 -0400 -@@ -2,7 +2,6 @@ - # of appearance. Changing the order has an impact on the overall integration - # process, which may cause wedges in the gate later. - pbr>=0.6,!=0.7,<1.0 --argparse - cliff>=1.10.0,<1.11.0 # Apache-2.0 - iso8601>=0.1.9 - netaddr>=0.7.12 ---- python-neutronclient-2.4.0/python_neutronclient.egg-info/requires.txt.orig 2015-10-19 23:04:16.421625992 -0400 -+++ python-neutronclient-2.4.0/python_neutronclient.egg-info/requires.txt 2015-10-19 23:06:19.661979752 -0400 -@@ -1,5 +1,4 @@ - pbr>=0.6,!=0.7,<1.0 --argparse - cliff>=1.10.0,<1.11.0 # Apache-2.0 - iso8601>=0.1.9 - netaddr>=0.7.12