Hello community,
here is the log from the commit of package python-neutronclient for
openSUSE:13.1 checked in at 2013-10-23 11:26:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/python-neutronclient (Old)
and /work/SRC/openSUSE:13.1/.python-neutronclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-neutronclient"
Changes:
--------
--- /work/SRC/openSUSE:13.1/python-neutronclient/python-neutronclient.changes
2013-10-02 13:32:59.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.python-neutronclient.new/python-neutronclient.changes
2013-10-23 11:27:02.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Oct 7 10:25:35 UTC 2013 - [email protected]
+
+- Downgrade to version 2.3.1:
+ * go with released version of client tools
+
+-------------------------------------------------------------------
+Wed Oct 2 00:29:52 UTC 2013 - [email protected]
+
+- Update to version 2.3.1.10.gc8dfa4b:
+ + Fixes the display message for the insert/remove firewall rule CLI
+
+-------------------------------------------------------------------
+Tue Oct 1 21:26:02 UTC 2013 - [email protected]
+
+- add bash completion
+
+-------------------------------------------------------------------
Old:
----
python-neutronclient-master.tar.gz
New:
----
python-neutronclient-2.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-neutronclient.spec ++++++
--- /var/tmp/diff_new_pack.r39tTK/_old 2013-10-23 11:27:02.000000000 +0200
+++ /var/tmp/diff_new_pack.r39tTK/_new 2013-10-23 11:27:02.000000000 +0200
@@ -19,13 +19,13 @@
%define component neutronclient
Name: python-neutronclient
-Version: 2.3.1.8.g16bf282
+Version: 2.3.1
Release: 0
Summary: Openstack Network (Quantum) API Client
License: Apache-2.0
Group: Development/Languages/Python
Url: http://launchpad.net/python-neutronclient
-Source: python-neutronclient-master.tar.gz
+Source: python-neutronclient-2.3.1.tar.gz
BuildRequires: openstack-suse-macros
BuildRequires: python-base
BuildRequires: python-distribute
@@ -95,7 +95,7 @@
This package contains testsuite files for %{name}.
%prep
-%setup -q -n python-neutronclient-2.3.1.8.g16bf282
+%setup -q -n python-neutronclient-2.3.1
%openstack_cleanup_prep
%build
@@ -106,6 +106,9 @@
%install
python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
+### bash-completion
+install -p -D -m 644 tools/neutron.bash_completion
%{buildroot}%{_sysconfdir}/bash_completion.d/openstack-neutron.sh
+
### test subpackage
%openstack_test_package_install
@@ -113,6 +116,7 @@
%defattr(-,root,root,-)
%doc LICENSE README.rst doc/build/html
%{_bindir}/neutron
+%{_sysconfdir}/bash_completion.d/openstack-neutron.sh
%{python_sitelib}/%{component}/
%{python_sitelib}/python_%{component}-*.egg-info
++++++ _service ++++++
--- /var/tmp/diff_new_pack.r39tTK/_old 2013-10-23 11:27:02.000000000 +0200
+++ /var/tmp/diff_new_pack.r39tTK/_new 2013-10-23 11:27:02.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/python-neutronclient/python-neutronclient-master.tar.gz</param>
+ <param
name="url">http://tarballs.openstack.org/python-neutronclient/python-neutronclient-2.3.1.tar.gz</param>
<param name="email">[email protected]</param>
<param name="plain-version">True</param>
</service>
++++++ python-neutronclient-master.tar.gz -> python-neutronclient-2.3.1.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-neutronclient-2.3.1.8.g16bf282/AUTHORS
new/python-neutronclient-2.3.1/AUTHORS
--- old/python-neutronclient-2.3.1.8.g16bf282/AUTHORS 2013-09-30
06:21:40.000000000 +0200
+++ new/python-neutronclient-2.3.1/AUTHORS 2013-09-16 18:51:43.000000000
+0200
@@ -12,7 +12,6 @@
Carl Baldwin <[email protected]>
Carlos D. Garza <[email protected]>
Chris Krelle <[email protected]>
-Chris Yeoh <[email protected]>
Chuck Short <[email protected]>
Clark Boylan <[email protected]>
Dan Prince <[email protected]>
@@ -38,7 +37,6 @@
Nachi Ueno <[email protected]>
Nachi Ueno <[email protected]>
Oleg Bondarev <[email protected]>
-Paul Michali <[email protected]>
Phil Day <[email protected]>
Rajesh Mohan <[email protected]>
Roman Podolyaka <[email protected]>
@@ -50,7 +48,6 @@
Stanislaw Pitucha <[email protected]>
Stephen Ma <[email protected]>
Swaminathan Vasudevan <[email protected]>
-Sylvain Afchain <[email protected]>
Tatyana Leontovich <[email protected]>
Thiago Morello <[email protected]>
Thierry Carrez <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-neutronclient-2.3.1.8.g16bf282/ChangeLog
new/python-neutronclient-2.3.1/ChangeLog
--- old/python-neutronclient-2.3.1.8.g16bf282/ChangeLog 2013-09-30
06:21:40.000000000 +0200
+++ new/python-neutronclient-2.3.1/ChangeLog 2013-09-16 18:51:43.000000000
+0200
@@ -1,69 +1,3 @@
-commit 16bf2825ad7b71f533ea3f9eb041168c586edb6f
-Author: Chris Yeoh <[email protected]>
-Date: Fri Sep 27 17:04:44 2013 +0930
-
- Adds IpAddressGenerationFailureClient exception
-
- Adds the IpAddressGenerationFailureClient exception so
- a more specific exception than NeutronClientException is raised
- when IPs run out. This will allow for better exception
- handling in Nova and help fix nova bug 1212137
-
- Change-Id: I921ba5d5f5ee3dc9620dcdbbd04d6fef824c9a53
- Closes-Bug: 1231836
-
-commit 15d5e508918ec7dda66c14838c1c0b7418a99d15
-Author: Monty Taylor <[email protected]>
-Date: Mon Sep 23 10:21:55 2013 -0400
-
- Update tox.ini to use new features
-
- tox 1.6 allows us to skip the sdist step, which is slow. This does that.
- It also allows us to override the install line. In this case, it's
- important as it allows us to stop getting pre-release software we
- weren't asking for.
-
- Change-Id: I2641c847403f61c5da8a8be0c8804c7c23a043ed
-
-commit 89936fa0a82603ebca1a2dff19d9039bd7a50cce
-Merge: 53f426a 768c639
-Author: Jenkins <[email protected]>
-Date: Mon Sep 23 10:13:52 2013 +0000
-
- Merge "Update help string to match API doc"
-
-commit 53f426a9e7d8e58fdfb6df2f650f788019e4b69d
-Merge: e61e846 f80190c
-Author: Jenkins <[email protected]>
-Date: Mon Sep 23 09:44:44 2013 +0000
-
- Merge "Remove openstack.common.exception usage"
-
-commit 768c6392beb3ab40fe1f6d3eefa7d316e4a1a424
-Author: Paul Michali <[email protected]>
-Date: Tue Sep 17 11:28:20 2013 -0400
-
- Update help string to match API doc
-
- This changes the text to match what we are stating in
- the API documentation (clarifying with review 46569).
-
- Since there is no validation, no changes were made for
- peer-address, which is now a string and not IPAddress.
- Also, we are leaving peer-id as mandatory, per the API
- document.
-
- bug-1225129
-
- Change-Id: I9c3f14213785084349b56a4081e34c209b878ec4
-
-commit e61e846292c7af0256bd3cdd908830187fe03d2f
-Merge: 030da0e 944333b
-Author: Jenkins <[email protected]>
-Date: Tue Sep 17 13:29:26 2013 +0000
-
- Merge "Client for metering extension"
-
commit 030da0eefb3ad1e7d925ceebcaa1705db43d0bec
Merge: a3f5d0a 07daaeb
Author: Jenkins <[email protected]>
@@ -71,16 +5,6 @@
Merge "Update cliff version to 1.4.3 in requirements.txt"
-commit 944333b1e6d8c16bdc99e1d7acc2c336ff27fd1b
-Author: Sylvain Afchain <[email protected]>
-Date: Thu Jul 4 15:46:19 2013 +0200
-
- Client for metering extension
-
- blueprint bandwidth-router-label
-
- Change-Id: I4d55c0f950d380c89e0d17c08facfe9ed078dd8e
-
commit a3f5d0ad7f7a1b79e17495dc9f483381fcbf68df
Merge: 920a5af e4351c3
Author: Jenkins <[email protected]>
@@ -320,18 +244,6 @@
Change-Id: I831da0cc3ff4004549a4e4673eadf2a5920d9573
-commit f80190cc584bbf82f909652299f6c739b0a5619f
-Author: ZhiQiang Fan <[email protected]>
-Date: Wed Aug 28 18:45:55 2013 +0800
-
- Remove openstack.common.exception usage
-
- Fixes-Bug: #1208734
-
- This file is deprecated, stop using it.
-
- Change-Id: I4ad53008a6d350dbf4003f4e01088e95d6b42a3e
-
commit 3a7f11f18e5b44efa2fd44ee954468f6d333efa4
Author: Justin Hammond <[email protected]>
Date: Thu Aug 15 14:37:26 2013 -0500
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-neutronclient-2.3.1.8.g16bf282/PKG-INFO
new/python-neutronclient-2.3.1/PKG-INFO
--- old/python-neutronclient-2.3.1.8.g16bf282/PKG-INFO 2013-09-30
06:21:40.000000000 +0200
+++ new/python-neutronclient-2.3.1/PKG-INFO 2013-09-16 18:51:43.000000000
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-neutronclient
-Version: 2.3.1.8.g16bf282
+Version: 2.3.1
Summary: CLI and Client Library for OpenStack Networking
Home-page: http://www.openstack.org/
Author: OpenStack Networking Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/common/exceptions.py
new/python-neutronclient-2.3.1/neutronclient/common/exceptions.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/common/exceptions.py
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/neutronclient/common/exceptions.py
2013-09-16 18:51:10.000000000 +0200
@@ -90,10 +90,6 @@
pass
-class IpAddressGenerationFailureClient(NeutronClientException):
- pass
-
-
class Unauthorized(NeutronClientException):
message = _("Unauthorized: bad credentials.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/neutron/v2_0/metering.py
new/python-neutronclient-2.3.1/neutronclient/neutron/v2_0/metering.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/neutron/v2_0/metering.py
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/neutronclient/neutron/v2_0/metering.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,137 +0,0 @@
-# Copyright (C) 2013 eNovance SAS <[email protected]>
-#
-# Author: Sylvain Afchain <[email protected]>
-#
-# 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.
-
-import logging
-
-from neutronclient.neutron import v2_0 as neutronv20
-
-
-class ListMeteringLabel(neutronv20.ListCommand):
- """List metering labels that belong to a given tenant."""
-
- resource = 'metering_label'
- log = logging.getLogger(__name__ + '.ListMeteringLabel')
- list_columns = ['id', 'name', 'description']
- pagination_support = True
- sorting_support = True
-
-
-class ShowMeteringLabel(neutronv20.ShowCommand):
- """Show information of a given metering label."""
-
- resource = 'metering_label'
- log = logging.getLogger(__name__ + '.ShowMeteringLabel')
- allow_names = True
-
-
-class CreateMeteringLabel(neutronv20.CreateCommand):
- """Create a metering label for a given tenant."""
-
- resource = 'metering_label'
- log = logging.getLogger(__name__ + '.CreateMeteringLabel')
-
- def add_known_arguments(self, parser):
- parser.add_argument(
- 'name', metavar='NAME',
- help='Name of metering label to create')
- parser.add_argument(
- '--description',
- help='description of metering label to create')
-
- def args2body(self, parsed_args):
- body = {'metering_label': {
- 'name': parsed_args.name}, }
-
- if parsed_args.tenant_id:
- body['metering_label'].update({'tenant_id': parsed_args.tenant_id})
- if parsed_args.description:
- body['metering_label'].update(
- {'description': parsed_args.description})
- return body
-
-
-class DeleteMeteringLabel(neutronv20.DeleteCommand):
- """Delete a given metering label."""
-
- log = logging.getLogger(__name__ + '.DeleteMeteringLabel')
- resource = 'metering_label'
- allow_names = True
-
-
-class ListMeteringLabelRule(neutronv20.ListCommand):
- """List metering labels that belong to a given label."""
-
- resource = 'metering_label_rule'
- log = logging.getLogger(__name__ + '.ListMeteringLabelRule')
- list_columns = ['id', 'excluded', 'direction', 'remote_ip_prefix']
- pagination_support = True
- sorting_support = True
-
-
-class ShowMeteringLabelRule(neutronv20.ShowCommand):
- """Show information of a given metering label rule."""
-
- resource = 'metering_label_rule'
- log = logging.getLogger(__name__ + '.ShowMeteringLabelRule')
-
-
-class CreateMeteringLabelRule(neutronv20.CreateCommand):
- """Create a metering label rule for a given label."""
-
- resource = 'metering_label_rule'
- log = logging.getLogger(__name__ + '.CreateMeteringLabelRule')
-
- def add_known_arguments(self, parser):
- parser.add_argument(
- 'label_id', metavar='LABEL',
- help='Id or Name of the label')
- parser.add_argument(
- 'remote_ip_prefix', metavar='REMOTE_IP_PREFIX',
- help='cidr to match on')
- parser.add_argument(
- '--direction',
- default='ingress', choices=['ingress', 'egress'],
- help='direction of traffic, default:ingress')
- parser.add_argument(
- '--excluded',
- action='store_true',
- help='exclude this cidr from the label, default:not excluded')
-
- def args2body(self, parsed_args):
- neutron_client = self.get_client()
- neutron_client.format = parsed_args.request_format
- label_id = neutronv20.find_resourceid_by_name_or_id(
- neutron_client, 'metering_label', parsed_args.label_id)
-
- body = {'metering_label_rule': {
- 'metering_label_id': label_id,
- 'remote_ip_prefix': parsed_args.remote_ip_prefix
- }}
-
- if parsed_args.direction:
- body['metering_label_rule'].update(
- {'direction': parsed_args.direction})
- if parsed_args.excluded:
- body['metering_label_rule'].update(
- {'excluded': True})
- return body
-
-
-class DeleteMeteringLabelRule(neutronv20.DeleteCommand):
- """Delete a given metering label."""
-
- log = logging.getLogger(__name__ + '.DeleteMeteringLabelRule')
- resource = 'metering_label_rule'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
new/python-neutronclient-2.3.1/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
2013-09-30 06:21:09.000000000 +0200
+++
new/python-neutronclient-2.3.1/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py
2013-09-16 18:51:10.000000000 +0200
@@ -100,12 +100,12 @@
parser.add_argument(
'--peer-address',
required=True,
- help='Peer gateway public IPv4/IPv6 address or FQDN.')
+ help='Remote branch router public '
+ 'IPv4 address or IPv6 address or FQDN.')
parser.add_argument(
'--peer-id',
required=True,
- help='Peer router identity for authentication. Can be '
- 'IPv4/IPv6 address, e-mail address, key id, or FQDN.')
+ help='Remote branch router identity')
parser.add_argument(
'--peer-cidr',
action='append', dest='peer_cidrs',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/openstack/common/exception.py
new/python-neutronclient-2.3.1/neutronclient/openstack/common/exception.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/openstack/common/exception.py
1970-01-01 01:00:00.000000000 +0100
+++ new/python-neutronclient-2.3.1/neutronclient/openstack/common/exception.py
2013-09-16 18:51:10.000000000 +0200
@@ -0,0 +1,142 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack Foundation.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""
+Exceptions common to OpenStack projects
+"""
+
+import logging
+
+from neutronclient.openstack.common.gettextutils import _
+
+_FATAL_EXCEPTION_FORMAT_ERRORS = False
+
+
+class Error(Exception):
+ def __init__(self, message=None):
+ super(Error, self).__init__(message)
+
+
+class ApiError(Error):
+ def __init__(self, message='Unknown', code='Unknown'):
+ self.message = message
+ self.code = code
+ super(ApiError, self).__init__('%s: %s' % (code, message))
+
+
+class NotFound(Error):
+ pass
+
+
+class UnknownScheme(Error):
+
+ msg = "Unknown scheme '%s' found in URI"
+
+ def __init__(self, scheme):
+ msg = self.__class__.msg % scheme
+ super(UnknownScheme, self).__init__(msg)
+
+
+class BadStoreUri(Error):
+
+ msg = "The Store URI %s was malformed. Reason: %s"
+
+ def __init__(self, uri, reason):
+ msg = self.__class__.msg % (uri, reason)
+ super(BadStoreUri, self).__init__(msg)
+
+
+class Duplicate(Error):
+ pass
+
+
+class NotAuthorized(Error):
+ pass
+
+
+class NotEmpty(Error):
+ pass
+
+
+class Invalid(Error):
+ pass
+
+
+class BadInputError(Exception):
+ """Error resulting from a client sending bad input to a server"""
+ pass
+
+
+class MissingArgumentError(Error):
+ pass
+
+
+class DatabaseMigrationError(Error):
+ pass
+
+
+class ClientConnectionError(Exception):
+ """Error resulting from a client connecting to a server"""
+ pass
+
+
+def wrap_exception(f):
+ def _wrap(*args, **kw):
+ try:
+ return f(*args, **kw)
+ except Exception, e:
+ if not isinstance(e, Error):
+ #exc_type, exc_value, exc_traceback = sys.exc_info()
+ logging.exception(_('Uncaught exception'))
+ #logging.error(traceback.extract_stack(exc_traceback))
+ raise Error(str(e))
+ raise
+ _wrap.func_name = f.func_name
+ return _wrap
+
+
+class OpenstackException(Exception):
+ """
+ Base Exception
+
+ To correctly use this class, inherit from it and define
+ a 'message' property. That message will get printf'd
+ with the keyword arguments provided to the constructor.
+ """
+ message = "An unknown exception occurred"
+
+ def __init__(self, **kwargs):
+ try:
+ self._error_string = self.message % kwargs
+
+ except Exception as e:
+ if _FATAL_EXCEPTION_FORMAT_ERRORS:
+ raise e
+ else:
+ # at least get the core message out if something happened
+ self._error_string = self.message
+
+ def __str__(self):
+ return self._error_string
+
+
+class MalformedRequestBody(OpenstackException):
+ message = "Malformed message body: %(reason)s"
+
+
+class InvalidContentType(OpenstackException):
+ message = "Invalid content type %(content_type)s"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/shell.py
new/python-neutronclient-2.3.1/neutronclient/shell.py
--- old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/shell.py
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/neutronclient/shell.py 2013-09-16
18:51:10.000000000 +0200
@@ -42,7 +42,6 @@
from neutronclient.neutron.v2_0.lb import member as lb_member
from neutronclient.neutron.v2_0.lb import pool as lb_pool
from neutronclient.neutron.v2_0.lb import vip as lb_vip
-from neutronclient.neutron.v2_0 import metering
from neutronclient.neutron.v2_0 import network
from neutronclient.neutron.v2_0 import networkprofile
from neutronclient.neutron.v2_0 import nvp_qos_queue
@@ -251,14 +250,6 @@
'vpn-ikepolicy-create': ikepolicy.CreateIKEPolicy,
'vpn-ikepolicy-update': ikepolicy.UpdateIKEPolicy,
'vpn-ikepolicy-delete': ikepolicy.DeleteIKEPolicy,
- 'meter-label-create': metering.CreateMeteringLabel,
- 'meter-label-list': metering.ListMeteringLabel,
- 'meter-label-show': metering.ShowMeteringLabel,
- 'meter-label-delete': metering.DeleteMeteringLabel,
- 'meter-label-rule-create': metering.CreateMeteringLabelRule,
- 'meter-label-rule-list': metering.ListMeteringLabelRule,
- 'meter-label-rule-show': metering.ShowMeteringLabelRule,
- 'meter-label-rule-delete': metering.DeleteMeteringLabelRule,
}
COMMANDS = {'2.0': COMMAND_V2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/tests/unit/test_cli20.py
new/python-neutronclient-2.3.1/neutronclient/tests/unit/test_cli20.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/tests/unit/test_cli20.py
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/neutronclient/tests/unit/test_cli20.py
2013-09-16 18:51:10.000000000 +0200
@@ -189,8 +189,7 @@
'security_group_rule', 'qos_queue',
'network_gateway', 'credential',
'network_profile', 'policy_profile',
- 'ikepolicy', 'ipsecpolicy',
- 'metering_label', 'metering_label_rule']
+ 'ikepolicy', 'ipsecpolicy']
if (resource in non_admin_status_resources):
body = {resource: {}, }
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/tests/unit/test_cli20_metering.py
new/python-neutronclient-2.3.1/neutronclient/tests/unit/test_cli20_metering.py
---
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/tests/unit/test_cli20_metering.py
2013-09-30 06:21:09.000000000 +0200
+++
new/python-neutronclient-2.3.1/neutronclient/tests/unit/test_cli20_metering.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,102 +0,0 @@
-# Copyright (C) 2013 eNovance SAS <[email protected]>
-#
-# Author: Sylvain Afchain <[email protected]>
-#
-# 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.
-
-import sys
-
-from neutronclient.neutron.v2_0 import metering
-from neutronclient.tests.unit import test_cli20
-
-
-class CLITestV20MeteringJSON(test_cli20.CLITestV20Base):
- def test_create_metering_label(self):
- """Create a metering label."""
- resource = 'metering_label'
- cmd = metering.CreateMeteringLabel(
- test_cli20.MyApp(sys.stdout), None)
- name = 'my label'
- myid = 'myid'
- description = 'my description'
- args = [name, '--description', description]
- position_names = ['name', 'description']
- position_values = [name, description]
- self._test_create_resource(resource, cmd, name, myid, args,
- position_names, position_values)
-
- def test_list_metering_labels(self):
- resources = "metering_labels"
- cmd = metering.ListMeteringLabel(
- test_cli20.MyApp(sys.stdout), None)
- self._test_list_resources(resources, cmd)
-
- def test_delete_metering_label(self):
- """Delete a metering label."""
- resource = 'metering_label'
- cmd = metering.DeleteMeteringLabel(
- test_cli20.MyApp(sys.stdout), None)
- myid = 'myid'
- args = [myid]
- self._test_delete_resource(resource, cmd, myid, args)
-
- def test_show_metering_label(self):
- resource = 'metering_label'
- cmd = metering.ShowMeteringLabel(
- test_cli20.MyApp(sys.stdout), None)
- args = ['--fields', 'id', self.test_id]
- self._test_show_resource(resource, cmd, self.test_id,
- args, ['id'])
-
- def test_create_metering_label_rule(self):
- resource = 'metering_label_rule'
- cmd = metering.CreateMeteringLabelRule(
- test_cli20.MyApp(sys.stdout), None)
- myid = 'myid'
- metering_label_id = 'aaa'
- remote_ip_prefix = '10.0.0.0/24'
- direction = 'ingress'
- args = [metering_label_id, remote_ip_prefix, '--direction', direction,
- '--excluded']
- position_names = ['metering_label_id', 'remote_ip_prefix', 'direction',
- 'excluded']
- position_values = [metering_label_id, remote_ip_prefix,
- direction, True]
- self._test_create_resource(resource, cmd, metering_label_id,
- myid, args, position_names, position_values)
-
- def test_list_metering_label_rules(self):
- resources = "metering_label_rules"
- cmd = metering.ListMeteringLabelRule(
- test_cli20.MyApp(sys.stdout), None)
- self._test_list_resources(resources, cmd)
-
- def test_delete_metering_label_rule(self):
- resource = 'metering_label_rule'
- cmd = metering.DeleteMeteringLabelRule(
- test_cli20.MyApp(sys.stdout), None)
- myid = 'myid'
- args = [myid]
- self._test_delete_resource(resource, cmd, myid, args)
-
- def test_show_metering_label_rule(self):
- resource = 'metering_label_rule'
- cmd = metering.ShowMeteringLabelRule(
- test_cli20.MyApp(sys.stdout), None)
- args = ['--fields', 'id', self.test_id]
- self._test_show_resource(resource, cmd, self.test_id,
- args, ['id'])
-
-
-class CLITestV20MeteringXML(CLITestV20MeteringJSON):
- format = 'xml'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/v2_0/client.py
new/python-neutronclient-2.3.1/neutronclient/v2_0/client.py
--- old/python-neutronclient-2.3.1.8.g16bf282/neutronclient/v2_0/client.py
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/neutronclient/v2_0/client.py 2013-09-16
18:51:10.000000000 +0200
@@ -49,9 +49,7 @@
'PortNotFound': exceptions.PortNotFoundClient,
'RequestedStateInvalid': exceptions.StateInvalidClient,
'PortInUse': exceptions.PortInUseClient,
- 'AlreadyAttached': exceptions.AlreadyAttachedClient,
- 'IpAddressGenerationFailure':
- exceptions.IpAddressGenerationFailureClient, }
+ 'AlreadyAttached': exceptions.AlreadyAttachedClient, }
error_dict = None
if isinstance(error_content, dict):
@@ -202,10 +200,7 @@
policy_profiles_path = "/policy_profiles"
policy_profile_path = "/policy_profiles/%s"
policy_profile_bindings_path = "/policy_profile_bindings"
- metering_labels_path = "/metering/metering-labels"
- metering_label_path = "/metering/metering-labels/%s"
- metering_label_rules_path = "/metering/metering-label-rules"
- metering_label_rule_path = "/metering/metering-label-rules/%s"
+
DHCP_NETS = '/dhcp-networks'
DHCP_AGENTS = '/dhcp-agents'
L3_ROUTERS = '/l3-routers'
@@ -241,8 +236,6 @@
'firewall_rules': 'firewall_rule',
'firewall_policies': 'firewall_policy',
'firewalls': 'firewall',
- 'metering_labels': 'metering_label',
- 'metering_label_rules': 'metering_label_rule'
}
# 8192 Is the default max URI len for eventlet.wsgi.server
MAX_URI_LEN = 8192
@@ -1064,51 +1057,6 @@
"""Update a policy profile."""
return self.put(self.policy_profile_path % (profile), body=body)
- @APIParamsCall
- def create_metering_label(self, body=None):
- """Creates a metering label."""
- return self.post(self.metering_labels_path, body=body)
-
- @APIParamsCall
- def delete_metering_label(self, label):
- """Deletes the specified metering label."""
- return self.delete(self.metering_label_path % (label))
-
- @APIParamsCall
- def list_metering_labels(self, retrieve_all=True, **_params):
- """Fetches a list of all metering labels for a tenant."""
- return self.list('metering_labels', self.metering_labels_path,
- retrieve_all, **_params)
-
- @APIParamsCall
- def show_metering_label(self, metering_label, **_params):
- """Fetches information of a certain metering label."""
- return self.get(self.metering_label_path %
- (metering_label), params=_params)
-
- @APIParamsCall
- def create_metering_label_rule(self, body=None):
- """Creates a metering label rule."""
- return self.post(self.metering_label_rules_path, body=body)
-
- @APIParamsCall
- def delete_metering_label_rule(self, rule):
- """Deletes the specified metering label rule."""
- return self.delete(self.metering_label_rule_path % (rule))
-
- @APIParamsCall
- def list_metering_label_rules(self, retrieve_all=True, **_params):
- """Fetches a list of all metering label rules for a label."""
- return self.list('metering_label_rules',
- self.metering_label_rules_path, retrieve_all,
- **_params)
-
- @APIParamsCall
- def show_metering_label_rule(self, metering_label_rule, **_params):
- """Fetches information of a certain metering label rule."""
- return self.get(self.metering_label_rule_path %
- (metering_label_rule), params=_params)
-
def __init__(self, **kwargs):
"""Initialize a new client for the Neutron v2.0 API."""
super(Client, self).__init__()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/openstack-common.conf
new/python-neutronclient-2.3.1/openstack-common.conf
--- old/python-neutronclient-2.3.1.8.g16bf282/openstack-common.conf
2013-09-30 06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/openstack-common.conf 2013-09-16
18:51:10.000000000 +0200
@@ -1,7 +1,7 @@
[DEFAULT]
# The list of modules to copy from openstack-common
-modules=gettextutils,jsonutils,strutils,timeutils
+modules=exception,gettextutils,jsonutils,strutils,timeutils
# The base module to hold the copy of openstack.common
base=neutronclient
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/python_neutronclient.egg-info/PKG-INFO
new/python-neutronclient-2.3.1/python_neutronclient.egg-info/PKG-INFO
---
old/python-neutronclient-2.3.1.8.g16bf282/python_neutronclient.egg-info/PKG-INFO
2013-09-30 06:21:40.000000000 +0200
+++ new/python-neutronclient-2.3.1/python_neutronclient.egg-info/PKG-INFO
2013-09-16 18:51:43.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-neutronclient
-Version: 2.3.1.8.g16bf282
+Version: 2.3.1
Summary: CLI and Client Library for OpenStack Networking
Home-page: http://www.openstack.org/
Author: OpenStack Networking Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-neutronclient-2.3.1.8.g16bf282/python_neutronclient.egg-info/SOURCES.txt
new/python-neutronclient-2.3.1/python_neutronclient.egg-info/SOURCES.txt
---
old/python-neutronclient-2.3.1.8.g16bf282/python_neutronclient.egg-info/SOURCES.txt
2013-09-30 06:21:40.000000000 +0200
+++ new/python-neutronclient-2.3.1/python_neutronclient.egg-info/SOURCES.txt
2013-09-16 18:51:43.000000000 +0200
@@ -35,7 +35,6 @@
neutronclient/neutron/v2_0/credential.py
neutronclient/neutron/v2_0/extension.py
neutronclient/neutron/v2_0/floatingip.py
-neutronclient/neutron/v2_0/metering.py
neutronclient/neutron/v2_0/network.py
neutronclient/neutron/v2_0/networkprofile.py
neutronclient/neutron/v2_0/nvp_qos_queue.py
@@ -64,6 +63,7 @@
neutronclient/neutron/v2_0/vpn/vpnservice.py
neutronclient/openstack/__init__.py
neutronclient/openstack/common/__init__.py
+neutronclient/openstack/common/exception.py
neutronclient/openstack/common/gettextutils.py
neutronclient/openstack/common/importutils.py
neutronclient/openstack/common/jsonutils.py
@@ -78,7 +78,6 @@
neutronclient/tests/unit/test_cli20_credential.py
neutronclient/tests/unit/test_cli20_extensions.py
neutronclient/tests/unit/test_cli20_floatingips.py
-neutronclient/tests/unit/test_cli20_metering.py
neutronclient/tests/unit/test_cli20_network.py
neutronclient/tests/unit/test_cli20_networkprofile.py
neutronclient/tests/unit/test_cli20_nvp_queue.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-neutronclient-2.3.1.8.g16bf282/tox.ini
new/python-neutronclient-2.3.1/tox.ini
--- old/python-neutronclient-2.3.1.8.g16bf282/tox.ini 2013-09-30
06:21:09.000000000 +0200
+++ new/python-neutronclient-2.3.1/tox.ini 2013-09-16 18:51:10.000000000
+0200
@@ -1,15 +1,11 @@
[tox]
envlist = py26,py27,py33,pypy,pep8
-minversion = 1.6
-skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
LANG=en_US.UTF-8
LANGUAGE=en_US:en
LC_ALL=C
-usedevelop = True
-install_command = pip install {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python setup.py testr --testr-args='{posargs}'
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
