October 2015 - openSUSE Commits - openSUSE Mailing Lists

commit python-oslo.vmware for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-oslo.vmware for openSUSE:Factory checked in at 2015-10-30 13:42:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.vmware (Old) and /work/SRC/openSUSE:Factory/.python-oslo.vmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.vmware" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.vmware/python-oslo.vmware.changes 2015-08-27 08:54:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.vmware.new/python-oslo.vmware.changes 2015-10-30 13:42:13.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Sep 9 07:15:02 UTC 2015 - tbechtold(a)suse.com + +- update to 1.21.0: + * Updated from global requirements + * Use SSL thumbprints for NFC transfer + * Update bandit.yaml to the latest + * flake8 - remove unused rules + * Imported Translations from Transifex + * Allow http connection pool size to be configured +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- oslo.vmware-1.18.0.tar.gz New: ---- oslo.vmware-1.21.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.vmware.spec ++++++ --- /var/tmp/diff_new_pack.49lZY8/_old 2015-10-30 13:42:13.000000000 +0100 +++ /var/tmp/diff_new_pack.49lZY8/_new 2015-10-30 13:42:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-oslo.vmware -Version: 1.18.0 +Version: 1.21.0 Release: 0 Url: https://launchpad.net/oslo/ Summary: OpenStack configuration API @@ -50,7 +50,7 @@ Requires: python-netaddr >= 0.7.12 Requires: python-oslo.concurrency >= 2.3.0 Requires: python-oslo.i18n >= 1.5.0 -Requires: python-oslo.utils >= 1.9.0 +Requires: python-oslo.utils >= 2.0.0 Requires: python-requests >= 2.5.2 Requires: python-six >= 1.9.0 Requires: python-stevedore >= 1.5.0 ++++++ oslo.vmware-1.18.0.tar.gz -> oslo.vmware-1.21.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/AUTHORS new/oslo.vmware-1.21.0/AUTHORS --- old/oslo.vmware-1.18.0/AUTHORS 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/AUTHORS 2015-09-01 20:38:51.000000000 +0200 @@ -24,3 +24,4 @@ Victor Stinner <vstinner(a)redhat.com> Vipin Balachandran <vbala(a)vmware.com> Vui Lam <vui(a)vmware.com> +ZHU ZHU <zhuzhubj(a)cn.ibm.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/ChangeLog new/oslo.vmware-1.21.0/ChangeLog --- old/oslo.vmware-1.18.0/ChangeLog 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/ChangeLog 2015-09-01 20:38:51.000000000 +0200 @@ -1,6 +1,30 @@ CHANGES ======= +1.21.0 +------ + +* Updated from global requirements +* Use SSL thumbprints for NFC transfer +* Updated from global requirements +* Update bandit.yaml to the latest + +1.20.0 +------ + +* Updated from global requirements +* Updated from global requirements +* Updated from global requirements +* flake8 - remove unused rules +* Imported Translations from Transifex +* Allow http connection pool size to be configured + +1.19.0 +------ + +* Imported Translations from Transifex +* Imported Translations from Transifex + 1.18.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/PKG-INFO new/oslo.vmware-1.21.0/PKG-INFO --- old/oslo.vmware-1.18.0/PKG-INFO 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/PKG-INFO 2015-09-01 20:38:51.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.vmware -Version: 1.18.0 +Version: 1.21.0 Summary: Oslo VMware library Home-page: http://launchpad.net/oslo Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/bandit.yaml new/oslo.vmware-1.21.0/bandit.yaml --- old/oslo.vmware-1.18.0/bandit.yaml 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/bandit.yaml 2015-09-01 20:38:14.000000000 +0200 @@ -11,9 +11,9 @@ #output_colors: # DEFAULT: '\033[0m' # HEADER: '\033[95m' -# INFO: '\033[94m' -# WARN: '\033[93m' -# ERROR: '\033[91m' +# LOW: '\033[94m' +# MEDIUM: '\033[93m' +# HIGH: '\033[91m' # optional: log format string #log_format: "[%(module)s]\t%(levelname)s\t%(message)s" @@ -21,6 +21,7 @@ # globs of files which should be analyzed include: - '*.py' + - '*.pyw' # a list of strings, which if found in the path will cause files to be excluded # for example /tests/ - to remove all all files in tests directory @@ -28,6 +29,36 @@ - '/tests/' profiles: + All: + include: + - any_other_function_with_shell_equals_true + - assert_used + - blacklist_calls + - blacklist_import_func + - blacklist_imports + - exec_used + - execute_with_run_as_root_equals_true + - hardcoded_bind_all_interfaces + - hardcoded_password + - hardcoded_sql_expressions + - hardcoded_tmp_directory + - jinja2_autoescape_false + - linux_commands_wildcard_injection + - paramiko_calls + - password_config_option_not_marked_secret + - request_with_no_cert_validation + - set_bad_file_permissions + - subprocess_popen_with_shell_equals_true + - subprocess_without_shell_equals_true + - start_process_with_a_shell + - start_process_with_no_shell + - start_process_with_partial_path + - ssl_with_bad_defaults + - ssl_with_bad_version + - ssl_with_no_version + - try_except_pass + - use_of_mako_templates + XSS: include: - jinja2_autoescape_false @@ -40,6 +71,7 @@ - any_other_function_with_shell_equals_true - start_process_with_a_shell - start_process_with_no_shell + - start_process_with_partial_path exclude: SqlInjection: @@ -56,8 +88,8 @@ qualnames: [marshal.load, marshal.loads] message: "Deserialization with the marshal module is possibly dangerous." - md5: - qualnames: [hashlib.md5] - message: "Use of insecure MD5 hash function." + qualnames: [hashlib.md5, Crypto.Hash.MD2.new, Crypto.Hash.MD4.new, Crypto.Hash.MD5.new, cryptography.hazmat.primitives.hashes.MD5] + message: "Use of insecure MD2, MD4, or MD5 hash function." - mktemp_q: qualnames: [tempfile.mktemp] message: "Use of insecure and deprecated function (mktemp)." @@ -76,6 +108,55 @@ - urllib_urlopen: qualnames: [urllib.urlopen, urllib.urlretrieve, urllib.URLopener, urllib.FancyURLopener, urllib2.urlopen, urllib2.Request] message: "Audit url open for permitted schemes. Allowing use of file:/ or custom schemes is often unexpected." + - random: + qualnames: [random.random, random.randrange, random.randint, random.choice, random.uniform, random.triangular] + message: "Standard pseudo-random generators are not suitable for security/cryptographic purposes." + level: "LOW" + + # Most of this is based off of Christian Heimes' work on defusedxml: + # https://pypi.python.org/pypi/defusedxml/#defusedxml-sax + + - xml_bad_cElementTree: + qualnames: [xml.etree.cElementTree.parse, + xml.etree.cElementTree.iterparse, + xml.etree.cElementTree.fromstring, + xml.etree.cElementTree.XMLParser] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_ElementTree: + qualnames: [xml.etree.ElementTree.parse, + xml.etree.ElementTree.iterparse, + xml.etree.ElementTree.fromstring, + xml.etree.ElementTree.XMLParser] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_expatreader: + qualnames: [xml.sax.expatreader.create_parser] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_expatbuilder: + qualnames: [xml.dom.expatbuilder.parse, + xml.dom.expatbuilder.parseString] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_sax: + qualnames: [xml.sax.parse, + xml.sax.parseString, + xml.sax.make_parser] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_minidom: + qualnames: [xml.dom.minidom.parse, + xml.dom.minidom.parseString] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_pulldom: + qualnames: [xml.dom.pulldom.parse, + xml.dom.pulldom.parseString] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + - xml_bad_etree: + qualnames: [lxml.etree.parse, + lxml.etree.fromstring, + lxml.etree.RestrictedElement, + lxml.etree.GlobalParserTLS, + lxml.etree.getDefaultParser, + lxml.etree.check_docinfo] + message: "Using {func} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {func} with it's defusedxml equivilent function." + shell_injection: # Start a process using the subprocess module, or one of its wrappers. @@ -95,15 +176,40 @@ bad_import_sets: - telnet: imports: [telnetlib] - level: ERROR + level: HIGH message: "Telnet is considered insecure. Use SSH or some other encrypted protocol." - info_libs: imports: [pickle, cPickle, subprocess, Crypto] - level: INFO + level: LOW message: "Consider possible security implications associated with {module} module." + # Most of this is based off of Christian Heimes' work on defusedxml: + # https://pypi.python.org/pypi/defusedxml/#defusedxml-sax + + - xml_libs: + imports: [xml.etree.cElementTree, + xml.etree.ElementTree, + xml.sax.expatreader, + xml.sax, + xml.dom.expatbuilder, + xml.dom.minidom, + xml.dom.pulldom, + lxml.etree, + lxml] + message: "Using {module} to parse untrusted XML data is known to be vulnerable to XML attacks. Replace {module} with the equivilent defusedxml package." + level: LOW + - xml_libs_high: + imports: [xmlrpclib] + message: "Using {module} to parse untrusted XML data is known to be vulnerable to XML attacks. Use defused.xmlrpc.monkey_patch() function to monkey-patch xmlrpclib and mitigate XML vulnerabilities." + level: HIGH + +hardcoded_tmp_directory: + tmp_dirs: ['/tmp', '/var/tmp', '/dev/shm'] + hardcoded_password: - word_list: "wordlist/default-passwords" + # Support for full path, relative path and special "%(site_data_dir)s" + # substitution (/usr/{local}/share) + word_list: "%(site_data_dir)s/wordlist/default-passwords" ssl_with_bad_version: bad_protocol_versions: @@ -127,3 +233,6 @@ - neutron.agent.linux.utils.execute - nova.utils.execute - nova.utils.trycmd + +try_except_pass: + check_typed_exception: True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-error.po new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-error.po --- old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-error.po 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-error.po 2015-09-01 20:38:14.000000000 +0200 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: oslo.vmware\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:10+0000\n" +"POT-Creation-Date: 2015-08-04 06:27+0000\n" "PO-Revision-Date: 2014-10-27 17:28+0000\n" "Last-Translator: Maxime COQUEREL <max.coquerel(a)gmail.com>\n" -"Language-Team: French (http://www.transifex.com/projects/p/oslovmware/" +"Language-Team: French (http://www.transifex.com/openstack/oslovmware/" "language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #, python-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-info.po new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-info.po --- old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-info.po 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-info.po 2015-09-01 20:38:14.000000000 +0200 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: oslo.vmware\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:10+0000\n" +"POT-Creation-Date: 2015-08-04 06:27+0000\n" "PO-Revision-Date: 2015-03-24 17:17+0000\n" "Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: French (http://www.transifex.com/projects/p/oslovmware/" +"Language-Team: French (http://www.transifex.com/openstack/oslovmware/" "language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #, python-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-warning.po new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-warning.po --- old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-warning.po 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware-log-warning.po 2015-09-01 20:38:14.000000000 +0200 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: oslo.vmware\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:10+0000\n" -"PO-Revision-Date: 2015-07-13 01:31+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: French (http://www.transifex.com/projects/p/oslovmware/" +"POT-Creation-Date: 2015-08-04 06:27+0000\n" +"PO-Revision-Date: 2015-07-27 22:54+0000\n" +"Last-Translator: Maxime COQUEREL <max.coquerel(a)gmail.com>\n" +"Language-Team: French (http://www.transifex.com/openstack/oslovmware/" "language/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Error occurred while closing the file handle" @@ -38,6 +38,11 @@ msgstr "Une erreur est survenue pendant la libération du bail pour %s." #, python-format +msgid "Exception %s is deprecated, it will be removed in the next release." +msgstr "" +"Exception %s est obsolète , il sera supprimé dans la prochaine version." + +#, python-format msgid "" "Exception which is in the suggested list of exceptions occurred while " "invoking function: %s." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware.po new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware.po --- old/oslo.vmware-1.18.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware.po 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/fr/LC_MESSAGES/oslo.vmware.po 2015-09-01 20:38:14.000000000 +0200 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: oslo.vmware\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:10+0000\n" -"PO-Revision-Date: 2015-06-22 13:36+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: French (http://www.transifex.com/projects/p/oslovmware/" +"POT-Creation-Date: 2015-08-04 06:27+0000\n" +"PO-Revision-Date: 2015-07-27 22:54+0000\n" +"Last-Translator: Maxime COQUEREL <max.coquerel(a)gmail.com>\n" +"Language-Team: French (http://www.transifex.com/openstack/oslovmware/" "language/fr/)\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" msgid "An unknown exception occurred." msgstr "Une exception inconnue s'est produite " @@ -159,6 +159,9 @@ msgid "Lease: %(lease)s is in error state. Details: %(error_msg)s." msgstr "Bail: %(lease)s est dans une erreur de status. Détails: %(error_msg)s." +msgid "Managed object not found." +msgstr "Objet géré introuvable." + #, python-format msgid "Missing parameter : %(param)s" msgstr "Paramètre manquant : %(param)s" @@ -212,6 +215,12 @@ msgid "details must be a dict" msgstr "details doit etre un dict" +msgid "exception message must not be a list" +msgstr "exception ne doit pas etre une liste" + +msgid "exception should be a subclass of VimException" +msgstr "exception devrait être une subclass de VimException" + msgid "fault_list must be a list" msgstr "fault_list doit etre une liste" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-critical.pot new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-critical.pot --- old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-critical.pot 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-critical.pot 2015-09-01 20:38:14.000000000 +0200 @@ -1,20 +1,20 @@ # Translations template for oslo.vmware. -# Copyright (C) 2014 ORGANIZATION +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the oslo.vmware # project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n" +"Project-Id-Version: oslo.vmware 1.18.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-07-14 06:00+0000\n" +"POT-Creation-Date: 2015-07-29 06:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-error.pot new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-error.pot --- old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-error.pot 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-error.pot 2015-09-01 20:38:14.000000000 +0200 @@ -1,71 +1,71 @@ # Translations template for oslo.vmware. -# Copyright (C) 2014 ORGANIZATION +# Copyright (C) 2015 ORGANIZATION # This file is distributed under the same license as the oslo.vmware # project. -# FIRST AUTHOR <EMAIL@ADDRESS>, 2014. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2015. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.vmware 0.6.0.34.g0b7ff54\n" +"Project-Id-Version: oslo.vmware 1.18.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-10-28 06:08+0000\n" +"POT-Creation-Date: 2015-07-29 06:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" -#: oslo/vmware/api.py:104 +#: oslo_vmware/api.py:105 #, python-format msgid "" "Cannot retry upon suggested exception since retry count (%(retry_count)d)" " reached max retry count (%(max_retry_count)d)." msgstr "" -#: oslo/vmware/api.py:261 +#: oslo_vmware/api.py:256 #, python-format msgid "" "Error occurred while logging out and terminating the current session with" " ID = %s." msgstr "" -#: oslo/vmware/api.py:402 +#: oslo_vmware/api.py:401 #, python-format msgid "Error occurred while reading info of task: %s." msgstr "" -#: oslo/vmware/api.py:457 +#: oslo_vmware/api.py:457 #, python-format msgid "Error occurred while checking state of lease: %s." msgstr "" -#: oslo/vmware/exceptions.py:134 +#: oslo_vmware/exceptions.py:82 msgid "Exception in string format operation" msgstr "" -#: oslo/vmware/exceptions.py:136 +#: oslo_vmware/exceptions.py:84 #, python-format msgid "%(name)s: %(value)s" msgstr "" -#: oslo/vmware/rw_handles.py:404 +#: oslo_vmware/rw_handles.py:424 #, python-format msgid "" "Error occurred while updating the write progress of VMDK file with URL = " "%s." msgstr "" -#: oslo/vmware/rw_handles.py:553 +#: oslo_vmware/rw_handles.py:564 #, python-format msgid "" "Error occurred while updating the read progress of VMDK file with URL = " "%s." msgstr "" -#: oslo/vmware/common/loopingcall.py:89 +#: oslo_vmware/common/loopingcall.py:89 msgid "in fixed duration looping call" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-info.pot new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-info.pot --- old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-info.pot 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-info.pot 2015-09-01 20:38:14.000000000 +0200 @@ -7,16 +7,16 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.vmware 0.11.1.post5\n" +"Project-Id-Version: oslo.vmware 1.18.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-03-25 06:04+0000\n" +"POT-Creation-Date: 2015-07-29 06:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" #: oslo_vmware/api.py:185 #, python-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-warning.pot new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-warning.pot --- old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware-log-warning.pot 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware-log-warning.pot 2015-09-01 20:38:14.000000000 +0200 @@ -7,16 +7,16 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.vmware 1.17.1.dev5\n" +"Project-Id-Version: oslo.vmware 1.18.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-23 06:10+0000\n" +"POT-Creation-Date: 2015-07-29 06:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" #: oslo_vmware/api.py:98 #, python-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware.pot new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware.pot --- old/oslo.vmware-1.18.0/oslo.vmware/locale/oslo.vmware.pot 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware/locale/oslo.vmware.pot 2015-09-01 20:38:14.000000000 +0200 @@ -7,16 +7,16 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.vmware 1.16.0\n" +"Project-Id-Version: oslo.vmware 1.18.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-09 06:13+0000\n" +"POT-Creation-Date: 2015-07-29 06:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.0\n" #: oslo_vmware/api.py:306 #, python-format @@ -25,12 +25,12 @@ "invoking method %(module)s.%(method)s." msgstr "" -#: oslo_vmware/api.py:471 +#: oslo_vmware/api.py:470 #, python-format msgid "Lease: %(lease)s is in error state. Details: %(error_msg)s." msgstr "" -#: oslo_vmware/api.py:478 +#: oslo_vmware/api.py:477 #, python-format msgid "Unknown state: %(state)s for lease: %(lease)s." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware.egg-info/PKG-INFO new/oslo.vmware-1.21.0/oslo.vmware.egg-info/PKG-INFO --- old/oslo.vmware-1.18.0/oslo.vmware.egg-info/PKG-INFO 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware.egg-info/PKG-INFO 2015-09-01 20:38:51.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.vmware -Version: 1.18.0 +Version: 1.21.0 Summary: Oslo VMware library Home-page: http://launchpad.net/oslo Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware.egg-info/pbr.json new/oslo.vmware-1.21.0/oslo.vmware.egg-info/pbr.json --- old/oslo.vmware-1.18.0/oslo.vmware.egg-info/pbr.json 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware.egg-info/pbr.json 2015-09-01 20:38:51.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "ddf8341"} \ No newline at end of file +{"git_version": "f1e117d", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo.vmware.egg-info/requires.txt new/oslo.vmware-1.21.0/oslo.vmware.egg-info/requires.txt --- old/oslo.vmware-1.18.0/oslo.vmware.egg-info/requires.txt 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo.vmware.egg-info/requires.txt 2015-09-01 20:38:51.000000000 +0200 @@ -1,14 +1,14 @@ -pbr<2.0,>=1.3 -stevedore>=1.5.0 # Apache-2.0 -netaddr>=0.7.12 +pbr<2.0,>=1.6 +stevedore>=1.5.0 +netaddr!=0.7.16,>=0.7.12 iso8601>=0.1.9 six>=1.9.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.utils>=1.9.0 # Apache-2.0 +oslo.i18n>=1.5.0 +oslo.utils>=2.0.0 Babel>=1.3 PyYAML>=3.1.0 suds-jurko>=0.6 eventlet>=0.17.4 requests>=2.5.2 urllib3>=1.8.3 -oslo.concurrency>=2.3.0 # Apache-2.0 +oslo.concurrency>=2.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/api.py new/oslo.vmware-1.21.0/oslo_vmware/api.py --- old/oslo.vmware-1.18.0/oslo_vmware/api.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/api.py 2015-09-01 20:38:14.000000000 +0200 @@ -138,7 +138,7 @@ def __init__(self, host, server_username, server_password, api_retry_count, task_poll_interval, scheme='https', create_session=True, wsdl_loc=None, pbm_wsdl_loc=None, - port=443, cacert=None, insecure=True): + port=443, cacert=None, insecure=True, pool_size=10): """Initializes the API session with given parameters. :param host: ESX/VC server IP address or host name @@ -158,6 +158,8 @@ TLS (https) server certificate. :param insecure: Verify HTTPS connections using system certificates, used only if cacert is not specified + :param pool_size: Maximum number of connections in http + connection pool :raises: VimException, VimFaultException, VimAttributeException, VimSessionOverLoadException """ @@ -176,6 +178,7 @@ self._pbm = None self._cacert = cacert self._insecure = insecure + self._pool_size = pool_size if create_session: self._create_session() @@ -192,7 +195,8 @@ port=self._port, wsdl_url=self._vim_wsdl_loc, cacert=self._cacert, - insecure=self._insecure) + insecure=self._insecure, + pool_maxsize=self._pool_size) return self._vim @property @@ -203,7 +207,8 @@ port=self._port, wsdl_url=self._pbm_wsdl_loc, cacert=self._cacert, - insecure=self._insecure) + insecure=self._insecure, + pool_maxsize=self._pool_size) if self._session_id: # To handle the case where pbm property is accessed after # session creation. If pbm property is accessed before session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/objects/datastore.py new/oslo.vmware-1.21.0/oslo_vmware/objects/datastore.py --- old/oslo.vmware-1.18.0/oslo_vmware/objects/datastore.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/objects/datastore.py 2015-09-01 20:38:14.000000000 +0200 @@ -14,7 +14,7 @@ import logging import posixpath -import random as _random # nosec +import random import six.moves.http_client as httplib import six.moves.urllib.parse as urlparse @@ -25,7 +25,6 @@ from oslo_vmware import vim_util LOG = logging.getLogger(__name__) -random = _random.SystemRandom() # nosec def get_datastore_by_ref(session, ds_ref): @@ -157,7 +156,7 @@ @staticmethod def choose_host(hosts): - i = random.randrange(0, len(hosts)) # nosec + i = random.SystemRandom().randrange(0, len(hosts)) return hosts[i] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/pbm.py new/oslo.vmware-1.21.0/oslo_vmware/pbm.py --- old/oslo.vmware-1.18.0/oslo_vmware/pbm.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/pbm.py 2015-09-01 20:38:14.000000000 +0200 @@ -41,7 +41,7 @@ """Service class that provides access to the Storage Policy API.""" def __init__(self, protocol='https', host='localhost', port=443, - wsdl_url=None, cacert=None, insecure=True): + wsdl_url=None, cacert=None, insecure=True, pool_maxsize=10): """Constructs a PBM service client object. :param protocol: http or https @@ -52,10 +52,13 @@ TLS (https) server certificate. :param insecure: Verify HTTPS connections using system certificates, used only if cacert is not specified + :param pool_maxsize: Maximum number of connections in http + connection pool """ base_url = service.Service.build_base_url(protocol, host, port) soap_url = base_url + '/pbm' - super(Pbm, self).__init__(wsdl_url, soap_url, cacert, insecure) + super(Pbm, self).__init__(wsdl_url, soap_url, cacert, insecure, + pool_maxsize) def set_soap_cookie(self, cookie): """Set the specified vCenter session cookie in the SOAP header diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/rw_handles.py new/oslo.vmware-1.21.0/oslo_vmware/rw_handles.py --- old/oslo.vmware-1.18.0/oslo_vmware/rw_handles.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/rw_handles.py 2015-09-01 20:38:14.000000000 +0200 @@ -62,16 +62,47 @@ self._last_logged_progress = 0 self._last_progress_udpate = 0 - def _create_read_connection(self, url, cookies=None, cacerts=False): + def _create_connection(self, url, method, cacerts=False, + ssl_thumbprint=None): + _urlparse = urlparse.urlparse(url) + scheme, netloc, path, params, query, fragment = _urlparse + if scheme == 'http': + conn = httplib.HTTPConnection(netloc) + elif scheme == 'https': + conn = httplib.HTTPSConnection(netloc) + cert_reqs = None + + # cacerts can be either True or False or contain + # actual certificates. If it is a boolean, then + # we need to set cert_reqs and clear the cacerts + if isinstance(cacerts, bool): + if cacerts: + cert_reqs = ssl.CERT_REQUIRED + else: + cert_reqs = ssl.CERT_NONE + cacerts = None + conn.set_cert(ca_certs=cacerts, cert_reqs=cert_reqs, + assert_fingerprint=ssl_thumbprint) + else: + excep_msg = _("Invalid scheme: %s.") % scheme + LOG.error(excep_msg) + raise ValueError(excep_msg) + + if query: + path = path + '?' + query + conn.putrequest(method, path) + return conn + + def _create_read_connection(self, url, cookies=None, cacerts=False, + ssl_thumbprint=None): LOG.debug("Opening URL: %s for reading.", url) try: - headers = {'User-Agent': USER_AGENT} - if cookies: - headers.update({'Cookie': - self._build_vim_cookie_header(cookies)}) - response = requests.get(url, headers=headers, stream=True, - verify=cacerts) - return response.raw + conn = self._create_connection(url, 'GET', cacerts, ssl_thumbprint) + vim_cookie = self._build_vim_cookie_header(cookies) + conn.putheader('User-Agent', USER_AGENT) + conn.putheader('Cookie', vim_cookie) + conn.endheaders() + return conn.getresponse() except Exception as excep: # TODO(vbala) We need to catch and raise specific exceptions # related to connection problems, invalid request and invalid @@ -86,41 +117,15 @@ cookies=None, overwrite=None, content_type=None, - cacerts=False): + cacerts=False, + ssl_thumbprint=None): """Create HTTP connection to write to VMDK file.""" LOG.debug("Creating HTTP connection to write to file with " "size = %(file_size)d and URL = %(url)s.", {'file_size': file_size, 'url': url}) - _urlparse = urlparse.urlparse(url) - scheme, netloc, path, params, query, fragment = _urlparse - try: - if scheme == 'http': - conn = httplib.HTTPConnection(netloc) - elif scheme == 'https': - conn = httplib.HTTPSConnection(netloc) - cert_reqs = None - - # cacerts can be either True or False or contain - # actual certificates. If it is a boolean, then - # we need to set cert_reqs and clear the cacerts - if isinstance(cacerts, bool): - if cacerts: - cert_reqs = ssl.CERT_REQUIRED - else: - cert_reqs = ssl.CERT_NONE - cacerts = None - - conn.set_cert(ca_certs=cacerts, cert_reqs=cert_reqs) - else: - excep_msg = _("Invalid scheme: %s.") % scheme - LOG.error(excep_msg) - raise ValueError(excep_msg) - - if query: - path = path + '?' + query - + conn = self._create_connection(url, 'PUT', cacerts, ssl_thumbprint) headers = {'User-Agent': USER_AGENT} if file_size: headers.update({'Content-Length': str(file_size)}) @@ -131,8 +136,6 @@ self._build_vim_cookie_header(cookies)}) if content_type: headers.update({'Content-Type': content_type}) - - conn.putrequest('PUT', path) for key, value in six.iteritems(headers): conn.putheader(key, value) conn.endheaders() @@ -213,16 +216,18 @@ def _find_vmdk_url(self, lease_info, host, port): """Find the URL corresponding to a VMDK file in lease info.""" url = None + ssl_thumbprint = None for deviceUrl in lease_info.deviceUrl: if deviceUrl.disk: url = self._fix_esx_url(deviceUrl.url, host, port) + ssl_thumbprint = deviceUrl.sslThumbprint break if not url: excep_msg = _("Could not retrieve VMDK URL from lease info.") LOG.error(excep_msg) raise exceptions.VimException(excep_msg) LOG.debug("Found VMDK URL: %s from lease info.", url) - return url + return url, ssl_thumbprint def _log_progress(self, progress): """Log data transfer progress.""" @@ -338,7 +343,7 @@ 'info') # Find VMDK URL where data is to be written - self._url = self._find_vmdk_url(lease_info, host, port) + self._url, thumbprint = self._find_vmdk_url(lease_info, host, port) self._vm_ref = lease_info.entity cookies = session.vim.client.options.transport.cookiejar @@ -349,7 +354,7 @@ cookies=cookies, overwrite='t', content_type=octet_stream, - cacerts=session._cacert) + ssl_thumbprint=thumbprint) FileHandle.__init__(self, self._conn) def get_imported_vm(self): @@ -499,12 +504,11 @@ 'info') # find URL of the VMDK file to be read and open connection - self._url = self._find_vmdk_url(lease_info, host, port) + self._url, thumbprint = self._find_vmdk_url(lease_info, host, port) cookies = session.vim.client.options.transport.cookiejar - cacerts = session.vim.client.options.transport.verify self._conn = self._create_read_connection(self._url, cookies=cookies, - cacerts=cacerts) + ssl_thumbprint=thumbprint) FileHandle.__init__(self, self._conn) def _create_and_wait_for_lease(self, session, vm_ref): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/service.py new/oslo.vmware-1.21.0/oslo_vmware/service.py --- old/oslo.vmware-1.18.0/oslo_vmware/service.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/service.py 2015-09-01 20:38:14.000000000 +0200 @@ -116,6 +116,9 @@ See http://stackoverflow.com/a/22989322 """ + def __init__(self, pool_maxsize=10): + super(LocalFileAdapter, self).__init__(pool_connections=pool_maxsize, + pool_maxsize=pool_maxsize) def _build_response_from_file(self, request): file_path = request.url[7:] @@ -131,13 +134,14 @@ class RequestsTransport(transport.Transport): - def __init__(self, cacert=None, insecure=True): + def __init__(self, cacert=None, insecure=True, pool_maxsize=10): transport.Transport.__init__(self) # insecure flag is used only if cacert is not # specified. self.verify = cacert if cacert else not insecure self.session = requests.Session() - self.session.mount('file:///', LocalFileAdapter()) + self.session.mount('file:///', + LocalFileAdapter(pool_maxsize=pool_maxsize)) self.cookiejar = self.session.cookies def open(self, request): @@ -184,12 +188,12 @@ """ def __init__(self, wsdl_url=None, soap_url=None, - cacert=None, insecure=True): + cacert=None, insecure=True, pool_maxsize=10): self.wsdl_url = wsdl_url self.soap_url = soap_url LOG.debug("Creating suds client with soap_url='%s' and wsdl_url='%s'", self.soap_url, self.wsdl_url) - transport = RequestsTransport(cacert, insecure) + transport = RequestsTransport(cacert, insecure, pool_maxsize) self.client = client.Client(self.wsdl_url, transport=transport, location=self.soap_url, @@ -376,8 +380,8 @@ if login.childAtPath('userName') is not None: login.childAtPath('userName').setText('***') - if login.childAtPath('password') is not None: - login.childAtPath('password').setText('***') + if login.childAtPath('password') is not None: # nosec + login.childAtPath('password').setText('***') # nosec session_id = login.childAtPath('sessionID') if session_id is not None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/tests/test_api.py new/oslo.vmware-1.21.0/oslo_vmware/tests/test_api.py --- old/oslo.vmware-1.18.0/oslo_vmware/tests/test_api.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/tests/test_api.py 2015-09-01 20:38:14.000000000 +0200 @@ -102,6 +102,7 @@ PORT = 443 USERNAME = 'admin' PASSWORD = 'password' + POOL_SIZE = 15 def setUp(self): super(VMwareAPISessionTest, self).setUp() @@ -122,7 +123,8 @@ _create_session, port=VMwareAPISessionTest.PORT, cacert=self.cert_mock, - insecure=False) + insecure=False, + pool_size=VMwareAPISessionTest.POOL_SIZE) def test_vim(self): api_session = self._create_api_session(False) @@ -132,7 +134,9 @@ port=VMwareAPISessionTest.PORT, wsdl_url=api_session._vim_wsdl_loc, cacert=self.cert_mock, - insecure=False) + insecure=False, + pool_maxsize=VMwareAPISessionTest. + POOL_SIZE) @mock.patch.object(pbm, 'Pbm') def test_pbm(self, pbm_mock): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/tests/test_rw_handles.py new/oslo.vmware-1.21.0/oslo_vmware/tests/test_rw_handles.py --- old/oslo.vmware-1.18.0/oslo_vmware/tests/test_rw_handles.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/tests/test_rw_handles.py 2015-09-01 20:38:14.000000000 +0200 @@ -24,6 +24,7 @@ from oslo_vmware import rw_handles from oslo_vmware.tests import base from oslo_vmware import vim_util +from urllib3 import connection as httplib class FileHandleTest(base.TestCase): @@ -41,15 +42,23 @@ device_url_1 = mock.Mock() device_url_1.disk = True device_url_1.url = 'https://*/ds1/vm1.vmdk' + device_url_1.sslThumbprint = '11:22:33:44:55' lease_info = mock.Mock() lease_info.deviceUrl = [device_url_0, device_url_1] host = '10.1.2.3' port = 443 exp_url = 'https://%s:%d/ds1/vm1.vmdk' % (host, port) vmw_http_file = rw_handles.FileHandle(None) - self.assertEqual(exp_url, vmw_http_file._find_vmdk_url(lease_info, - host, - port)) + url, thumbprint = vmw_http_file._find_vmdk_url(lease_info, host, port) + self.assertEqual(exp_url, url) + self.assertEqual('11:22:33:44:55', thumbprint) + + def test_create_connection(self): + handle = rw_handles.FileHandle(None) + conn = handle._create_connection('http://fira', 'GET') + self.assertIsInstance(conn, httplib.HTTPConnection) + conn = handle._create_connection('https://fira', 'GET') + self.assertIsInstance(conn, httplib.HTTPSConnection) class FileWriteHandleTest(base.TestCase): @@ -182,12 +191,15 @@ def setUp(self): super(VmdkReadHandleTest, self).setUp() - - send_patcher = mock.patch('requests.sessions.Session.send') - self.addCleanup(send_patcher.stop) - send_mock = send_patcher.start() - self._response = mock.Mock() - send_mock.return_value = self._response + self._resp = mock.Mock() + self._resp.read.return_value = 'fake-data' + self._conn = mock.Mock() + self._conn.getresponse.return_value = self._resp + patcher = mock.patch( + 'urllib3.connection.HTTPConnection') + self.addCleanup(patcher.stop) + HTTPConnectionMock = patcher.start() + HTTPConnectionMock.return_value = self._conn def _create_mock_session(self, disk=True, progress=-1): device_url = mock.Mock() @@ -227,25 +239,22 @@ def test_read(self): chunk_size = rw_handles.READ_CHUNKSIZE session = self._create_mock_session() - self._response.raw.read.return_value = [1] * chunk_size handle = rw_handles.VmdkReadHandle(session, '10.1.2.3', 443, 'vm-1', '[ds] disk1.vmdk', chunk_size * 10) - handle.read(chunk_size) - self.assertEqual(chunk_size, handle._bytes_read) - self._response.raw.read.assert_called_once_with(chunk_size) + data = handle.read(chunk_size) + self.assertEqual('fake-data', data) def test_update_progress(self): - chunk_size = rw_handles.READ_CHUNKSIZE + chunk_size = len('fake-data') vmdk_size = chunk_size * 10 session = self._create_mock_session(True, 10) - self._response.raw.read.return_value = [1] * chunk_size handle = rw_handles.VmdkReadHandle(session, '10.1.2.3', 443, 'vm-1', '[ds] disk1.vmdk', vmdk_size) - handle.read(chunk_size) + data = handle.read(chunk_size) handle.update_progress() - self._response.raw.read.assert_called_once_with(chunk_size) + self.assertEqual('fake-data', data) def test_update_progress_with_error(self): session = self._create_mock_session(True, 10) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/tests/test_service.py new/oslo.vmware-1.21.0/oslo_vmware/tests/test_service.py --- old/oslo.vmware-1.18.0/oslo_vmware/tests/test_service.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/tests/test_service.py 2015-09-01 20:38:14.000000000 +0200 @@ -440,6 +440,12 @@ self.assertEqual(mock.sentinel.headers, reply.headers) self.assertEqual(mock.sentinel.content, reply.message) + def test_set_conn_pool_size(self): + transport = service.RequestsTransport(pool_maxsize=100) + local_file_adapter = transport.session.adapters['file:///'] + self.assertEqual(100, local_file_adapter._pool_connections) + self.assertEqual(100, local_file_adapter._pool_maxsize) + @mock.patch('os.path.getsize') def test_send_with_local_file_url(self, get_size_mock): transport = service.RequestsTransport() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/oslo_vmware/vim.py new/oslo.vmware-1.21.0/oslo_vmware/vim.py --- old/oslo.vmware-1.18.0/oslo_vmware/vim.py 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/oslo_vmware/vim.py 2015-09-01 20:38:14.000000000 +0200 @@ -20,7 +20,7 @@ """Service class that provides access to the VIM API.""" def __init__(self, protocol='https', host='localhost', port=None, - wsdl_url=None, cacert=None, insecure=True): + wsdl_url=None, cacert=None, insecure=True, pool_maxsize=10): """Constructs a VIM service client object. :param protocol: http or https @@ -31,6 +31,8 @@ TLS (https) server certificate. :param insecure: Verify HTTPS connections using system certificates, used only if cacert is not specified + :param pool_maxsize: Maximum number of connections in http + connection pool :raises: VimException, VimFaultException, VimAttributeException, VimSessionOverLoadException, VimConnectionException """ @@ -38,7 +40,8 @@ soap_url = base_url + '/sdk' if wsdl_url is None: wsdl_url = soap_url + '/vimService.wsdl' - super(Vim, self).__init__(wsdl_url, soap_url, cacert, insecure) + super(Vim, self).__init__(wsdl_url, soap_url, cacert, insecure, + pool_maxsize) def retrieve_service_content(self): return self.RetrieveServiceContent(service.SERVICE_INSTANCE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/requirements.txt new/oslo.vmware-1.21.0/requirements.txt --- old/oslo.vmware-1.18.0/requirements.txt 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/requirements.txt 2015-09-01 20:38:14.000000000 +0200 @@ -2,10 +2,10 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=1.3 +pbr<2.0,>=1.6 stevedore>=1.5.0 # Apache-2.0 -netaddr>=0.7.12 +netaddr!=0.7.16,>=0.7.12 # for timeutils iso8601>=0.1.9 @@ -14,7 +14,7 @@ six>=1.9.0 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.utils>=1.9.0 # Apache-2.0 +oslo.utils>=2.0.0 # Apache-2.0 Babel>=1.3 # for the routing notifier diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/setup.cfg new/oslo.vmware-1.21.0/setup.cfg --- old/oslo.vmware-1.18.0/setup.cfg 2015-07-27 21:59:44.000000000 +0200 +++ new/oslo.vmware-1.21.0/setup.cfg 2015-09-01 20:38:51.000000000 +0200 @@ -52,7 +52,7 @@ universal = 1 [egg_info] -tag_build = tag_date = 0 +tag_build = tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/test-requirements.txt new/oslo.vmware-1.21.0/test-requirements.txt --- old/oslo.vmware-1.18.0/test-requirements.txt 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/test-requirements.txt 2015-09-01 20:38:14.000000000 +0200 @@ -23,4 +23,4 @@ oslosphinx>=2.5.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -bandit>=0.10.1 +bandit>=0.13.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.vmware-1.18.0/tox.ini new/oslo.vmware-1.21.0/tox.ini --- old/oslo.vmware-1.18.0/tox.ini 2015-07-27 21:59:14.000000000 +0200 +++ new/oslo.vmware-1.21.0/tox.ini 2015-09-01 20:38:14.000000000 +0200 @@ -18,7 +18,7 @@ [testenv:bandit] deps = -r{toxinidir}/test-requirements.txt -commands = bandit -c bandit.yaml -r oslo_vmware -n 5 -ll +commands = bandit -c bandit.yaml -r oslo_vmware -n 5 [testenv:docs] commands = python setup.py build_sphinx @@ -33,7 +33,7 @@ [flake8] show-source = True -ignore = H405,H904 +ignore = H405 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,__init__.py [hacking]

1 0

commit python-pycadf for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-pycadf for openSUSE:Factory checked in at 2015-10-30 13:42:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycadf (Old) and /work/SRC/openSUSE:Factory/.python-pycadf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pycadf" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycadf/python-pycadf.changes 2014-06-04 18:39:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pycadf.new/python-pycadf.changes 2015-10-30 13:42:11.000000000 +0100 @@ -1,0 +2,65 @@ +Mon Sep 7 11:25:58 UTC 2015 - dmueller(a)suse.com + +- update to 1.1.0: + * Adding barbican specific base resources + * Updated from global requirements + * ensure id is not empty + * Add api_audit_map.conf for Ceilometer project + * Remove script already nuked from oslo-incubator + * Add unit tests to increase coverage of cadftype + * Remove run_cross_tests.sh + * drop audit middleware + * Add trove conf file to setup.cfg + * Added a testcase to cover ValueError in tag.py + * Add test to cover mask value for utils.mask_value + * Uncap library requirements for liberty + * update README.rst to include additional links + * Remove empty _templates folder + * Add a section for audit maps + * Fix formatting error for geolocation note + * add a new set of release notes + * Clean up pycadf's doc landing page + * Add api_audit_map.conf for Trove project + * Additional doc clean up + * cleanup documentation + * Add deprecation message to Audit API + * Do not depend on endpoint id existing in the service catalog + * Fix oslo.messaging link in docs + * Use oslo_context + * Use oslo namespaces + * Add a new CADF type for keystone trusts + * add helper module + * Add new CADF taxonomy types + * Pull out some CADF taxonomy to be constants + * upgrade hacking to 0.10.0 + * deprecate audit middleware + * sync oslo + * Workflow documentation is now in infra-manual + * Add classifiers for Python 3 + * Add release notes + * Use correct name of oslo debugger script + * Remove unused dependencies from pycadf + * Use oslo tests fixture + * Use oslo.serialization + * Sync oslo libraries + * Remove dependencies from docs test env in tox.ini + * Stop using intersphinx + * Use oslo_debug_helper and remove our own version + * Work toward Python 3.4 support and testing + * add federated credential + * define the project goal + * Enable PEP8 checks E128, E251 and E265 + * clean up license headers + * add CONTRIBUTING doc + * revise readme with a project description + * Debug env for tox + * Fix a grammatical error in contributing doc + * Fix typo comments + * Enabled hacking checks H305 and H307 + * Bump hacking to version 0.9.2 + * Remove docutils pin + * Expand © and remove unnecessary encoding lines + * Bump hacking to 0.9.x series + * add audit_maps for more OpenStack components + +------------------------------------------------------------------- Old: ---- pycadf-0.5.1.tar.gz New: ---- pycadf-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycadf.spec ++++++ --- /var/tmp/diff_new_pack.KB3X5N/_old 2015-10-30 13:42:12.000000000 +0100 +++ /var/tmp/diff_new_pack.KB3X5N/_new 2015-10-30 13:42:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pycadf # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-pycadf -Version: 0.5.1 +Version: 1.1.0 Release: 0 Summary: DMTF Cloud Audit (CADF) data mode License: Apache-2.0 @@ -36,6 +36,7 @@ BuildRequires: python-netaddr >= 0.7.6 BuildRequires: python-oslo.config >= 1.2.0 BuildRequires: python-oslo.messaging +BuildRequires: python-oslotest BuildRequires: python-python-subunit >= 0.0.18 BuildRequires: python-six >= 1.4.1 BuildRequires: python-testrepository >= 0.0.17 @@ -43,12 +44,11 @@ BuildRequires: python-testtools >= 0.9.34 Requires: python-Babel >= 1.3 Requires: python-WebOb >= 1.2.3 -Requires: python-iso8601 >= 0.1.8 Requires: python-netaddr >= 0.7.6 -Requires: python-oslo.config >= 1.2.0 -Requires: python-oslo.messaging >= 1.3.0a4 -Requires: python-pytz >= 2010h -Requires: python-six >= 1.4.1 +Requires: python-oslo.config >= 2.1.0 +Requires: python-oslo.serialization >= 1.4.0 +Requires: python-pytz >= 2013.6 +Requires: python-six >= 1.9.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ pycadf-0.5.1.tar.gz -> pycadf-1.1.0.tar.gz ++++++ ++++ 7190 lines of diff (skipped)

1 0

commit python-openstackclient for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-openstackclient for openSUSE:Factory checked in at 2015-10-30 13:42:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-openstackclient (Old) and /work/SRC/openSUSE:Factory/.python-openstackclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-openstackclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-openstackclient/python-openstackclient.changes 2015-09-09 20:20:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-openstackclient.new/python-openstackclient.changes 2015-10-30 13:42:09.000000000 +0100 @@ -1,0 +2,54 @@ +Sun Oct 4 07:16:35 UTC 2015 - tbechtold(a)suse.com + +- update to 1.7.1: + * Release notes 1.7.1 + * docs: pip install -e needs an argument + * Glance `image set` Resolve Fracturing + +------------------------------------------------------------------- +Sat Sep 26 17:48:50 UTC 2015 - tbechtold(a)suse.com + +- update to 1.7.0: + * Add release notes for 1.7.0 + * Use format_list instead of format_dict when listing images + * Format an images properties and tags + * Add image create support for image v2 + * Change ignore-errors to ignore_errors + * Imported Translations from Zanata + * Remove backticks from help in role commands + * Move option logging back to start if initialize_app() + * Set default auth plugin back to 'password' + * Updated from global requirements + * set image api to 1 for functional tests + * Updated from global requirements + * Imported Translations from Transifex + * Use novaclient.client.Client for initialization Nova client + * Add filtering by user for 'openstack server list' + * Add support for listing servers of other projects + * Support listing users by group name + * Fix compute API version snafu + * Properly handle port arguments for ICMP + * Use a common decorator to log 'take_action' activation + * Fix 'auhentication' spelling error/mistake + * Volume v2 list does not show server name + * Ignore flavor and image find errors on server show + * Create log configuration class + * default OS_VOLUME_API_VERSION to v2 + * Automate flavors, networks, and image get + * unwedge the osc gate + * additional functional tests for identity providers + * Adds documentation on weekly meeting + * Update the plugin docs for designate + * Added note to install openstackclient + * Running 'limits show' returns nothing + * Optimize log formatting + * Extract log level from configuration file + * Move options to log level out of shell.py + * Move set warnings filters to logging module + * Updated from global requirements + * Updated from global requirements + * Updated from global requirements + * Add tests for volume quota set +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- python-openstackclient-1.6.0.tar.gz New: ---- python-openstackclient-1.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-openstackclient.spec ++++++ --- /var/tmp/diff_new_pack.yXho2H/_old 2015-10-30 13:42:10.000000000 +0100 +++ /var/tmp/diff_new_pack.yXho2H/_new 2015-10-30 13:42:10.000000000 +0100 @@ -19,7 +19,7 @@ %define component openstackclient Name: python-%{component} -Version: 1.6.0 +Version: 1.7.1 Release: 0 Summary: OpenStack Unified Command Line Client License: Apache-2.0 @@ -62,10 +62,11 @@ Requires: python-glanceclient >= 0.18.0 Requires: python-keystoneclient >= 1.6.0 Requires: python-neutronclient >= 2.6.0 -Requires: python-novaclient >= 2.26.0 -Requires: python-oslo.config >= 1.11.0 +Requires: python-novaclient >= 2.28.1 +Requires: python-os-client-config >= 1.4.0 +Requires: python-oslo.config >= 2.3.0 Requires: python-oslo.i18n >= 1.5.0 -Requires: python-pbr >= 1.4 +Requires: python-pbr >= 1.6 Requires: python-requests >= 2.5.2 Requires: python-six >= 1.9.0 Requires: python-stevedore >= 1.5.0 ++++++ python-openstackclient-1.6.0.tar.gz -> python-openstackclient-1.7.1.tar.gz ++++++ ++++ 5854 lines of diff (skipped)

1 0

commit python-oslo.messaging for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-oslo.messaging for openSUSE:Factory checked in at 2015-10-30 13:42:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.messaging (Old) and /work/SRC/openSUSE:Factory/.python-oslo.messaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.messaging" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.messaging/python-oslo.messaging.changes 2015-09-02 07:54:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.messaging.new/python-oslo.messaging.changes 2015-10-30 13:42:07.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Sep 19 06:33:11 UTC 2015 - tbechtold(a)suse.com + +- update to 2.5.0: + * Imported Translations from Transifex + * Update path to subunit2html in post_test_hook + * Fix typos in a document and a comment + * Updated from global requirements + * Imported Translations from Transifex + * Updated from global requirements + * Port the AMQP1 driver to new Pyngus SASL API + * Updated from global requirements + * Imported Translations from Transifex + * Updated from global requirements + * Add config options to the documentation + * Updated from global requirements +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- oslo.messaging-2.4.0.tar.gz New: ---- oslo.messaging-2.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.messaging.spec ++++++ --- /var/tmp/diff_new_pack.VGvh28/_old 2015-10-30 13:42:08.000000000 +0100 +++ /var/tmp/diff_new_pack.VGvh28/_new 2015-10-30 13:42:08.000000000 +0100 @@ -16,9 +16,9 @@ # -%define component oslo +%define component oslo_messaging Name: python-oslo.messaging -Version: 2.4.0 +Version: 2.5.0 Release: 0 Url: https://launchpad.net/oslo/ Summary: OpenStack Messaging API @@ -41,7 +41,7 @@ BuildRequires: python-oslo.utils BuildRequires: python-oslosphinx BuildRequires: python-pbr -BuildRequires: python-qpid +##BuildRequires: python-qpid BuildRequires: python-six Requires: python-PyYAML >= 3.1.0 Requires: python-WebOb >= 1.2.3 @@ -52,13 +52,13 @@ Requires: python-futurist >= 0.1.2 Requires: python-greenlet >= 0.3.2 Requires: python-kombu >= 3.0.7 -Requires: python-oslo.config >= 2.1.0 +Requires: python-oslo.config >= 2.3.0 Requires: python-oslo.context >= 0.2.0 Requires: python-oslo.i18n >= 1.5.0 Requires: python-oslo.log >= 1.8.0 -Requires: python-oslo.middleware >= 2.4.0 +Requires: python-oslo.middleware >= 2.8.0 Requires: python-oslo.serialization >= 1.4.0 -Requires: python-oslo.service >= 0.6.0 +Requires: python-oslo.service >= 0.7.0 Requires: python-oslo.utils >= 2.0.0 Requires: python-six >= 1.9.0 Requires: python-stevedore >= 1.5.0 ++++++ oslo.messaging-2.4.0.tar.gz -> oslo.messaging-2.5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/AUTHORS new/oslo.messaging-2.5.0/AUTHORS --- old/oslo.messaging-2.4.0/AUTHORS 2015-08-24 23:36:13.000000000 +0200 +++ new/oslo.messaging-2.5.0/AUTHORS 2015-09-08 18:01:43.000000000 +0200 @@ -73,6 +73,7 @@ Sergey Lukjanov <slukjanov(a)mirantis.com> Sergey Vilgelm <sergey(a)vilgelm.info> Stanislav Kudriashev <skudriashev(a)griddynamics.com> +Takashi NATSUME <natsume.takashi(a)lab.ntt.co.jp> Thomas Goirand <thomas(a)goirand.fr> Thomas Herve <thomas.herve(a)enovance.com> Victor Sergeyev <vsergeyev(a)mirantis.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/ChangeLog new/oslo.messaging-2.5.0/ChangeLog --- old/oslo.messaging-2.4.0/ChangeLog 2015-08-24 23:36:13.000000000 +0200 +++ new/oslo.messaging-2.5.0/ChangeLog 2015-09-08 18:01:43.000000000 +0200 @@ -1,6 +1,22 @@ CHANGES ======= +2.5.0 +----- + +* Imported Translations from Transifex +* Update path to subunit2html in post_test_hook +* Fix typos in a document and a comment +* Updated from global requirements +* Imported Translations from Transifex +* Updated from global requirements +* Port the AMQP1 driver to new Pyngus SASL API +* Updated from global requirements +* Imported Translations from Transifex +* Updated from global requirements +* Add config options to the documentation +* Updated from global requirements + 2.4.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/PKG-INFO new/oslo.messaging-2.5.0/PKG-INFO --- old/oslo.messaging-2.4.0/PKG-INFO 2015-08-24 23:36:14.000000000 +0200 +++ new/oslo.messaging-2.5.0/PKG-INFO 2015-09-08 18:01:44.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.messaging -Version: 2.4.0 +Version: 2.5.0 Summary: Oslo Messaging API Home-page: https://launchpad.net/oslo Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/doc/source/conf.py new/oslo.messaging-2.5.0/doc/source/conf.py --- old/oslo.messaging-2.4.0/doc/source/conf.py 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/doc/source/conf.py 2015-09-08 17:59:38.000000000 +0200 @@ -12,6 +12,7 @@ 'sphinx.ext.autodoc', 'oslosphinx', 'stevedore.sphinxext', + 'oslo_config.sphinxext', ] # autodoc generation is a bit aggressive and a nuisance when doing heavy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/doc/source/opts.rst new/oslo.messaging-2.5.0/doc/source/opts.rst --- old/oslo.messaging-2.4.0/doc/source/opts.rst 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/doc/source/opts.rst 2015-09-08 17:59:38.000000000 +0200 @@ -1,6 +1,15 @@ ----------------------- -Configuration Options ----------------------- +======================= + Configuration Options +======================= + +oslo.messaging uses oslo.config to define and manage configuration +options to allow the deployer to control how an application uses the +underlying messaging system. + +.. show-options:: oslo.messaging + +API +=== .. currentmodule:: oslo_messaging.opts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/doc/source/zmq_driver.rst new/oslo.messaging-2.5.0/doc/source/zmq_driver.rst --- old/oslo.messaging-2.4.0/doc/source/zmq_driver.rst 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/doc/source/zmq_driver.rst 2015-09-08 17:59:38.000000000 +0200 @@ -181,7 +181,7 @@ and give all openstack daemons access via group membership of 'oslo' - this supports using /var/run/openstack as a shared IPC directory for all openstack processes, allowing different services to be hosted on the same server, served -by a single oslo-messaging-zmq-reciever process. +by a single oslo-messaging-zmq-receiver process. The IPC runtime directory, 'rpc_zmq_ipc_dir', can be set in [DEFAULT] section. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po new/oslo.messaging-2.5.0/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# German translations for oslo.messaging. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.messaging -# project. -# -# Translators: -# Andreas Jaeger <jaegerandi(a)gmail.com>, 2014 -# Ettore Atalan <atalanttore(a)googlemail.com>, 2014 -msgid "" -msgstr "" -"Project-Id-Version: oslo.messaging\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:29+0000\n" -"PO-Revision-Date: 2015-08-03 21:07+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: German (http://www.transifex.com/openstack/oslomessaging/" -"language/de/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" - -#, python-format -msgid "Exception during message handling: %s" -msgstr "Exception während Messagebehandlung: %s" - -#, python-format -msgid "Failed to load any notifiers for %s" -msgstr "Es konnten keine Notifiers für %s geladen werden" - -#, python-format -msgid "Routing '%(event)s' notification to '%(driver)s' driver" -msgstr "'%(event)s' Notfikation wird zum Treiber '%(driver)s' geroutet." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po 2015-09-08 17:59:38.000000000 +0200 @@ -4,13 +4,13 @@ # project. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014 +# Andi Chandler <andi(a)gowling.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: oslo.messaging\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:29+0000\n" -"PO-Revision-Date: 2014-11-03 23:02+0000\n" +"POT-Creation-Date: 2015-08-27 06:15+0000\n" +"PO-Revision-Date: 2015-08-27 00:47+0000\n" "Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/" "oslomessaging/language/en_GB/)\n" @@ -24,3 +24,7 @@ #, python-format msgid "An exception occurred processing the API call: %s " msgstr "An exception occurred processing the API call: %s " + +#, python-format +msgid "Exception during message handling: %s" +msgstr "Exception during message handling: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po 2015-09-08 17:59:38.000000000 +0200 @@ -0,0 +1,26 @@ +# Translations template for oslo.messaging. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the oslo.messaging +# project. +# +# Translators: +# Andi Chandler <andi(a)gowling.com>, 2014-2015 +msgid "" +msgstr "" +"Project-Id-Version: oslo.messaging\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-08-27 06:15+0000\n" +"PO-Revision-Date: 2015-08-27 00:47+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/" +"oslomessaging/language/en_GB/)\n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, python-format +msgid "Routing '%(event)s' notification to '%(driver)s' driver" +msgstr "Routing '%(event)s' notification to '%(driver)s' driver" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po 2015-09-08 17:59:38.000000000 +0200 @@ -0,0 +1,36 @@ +# Translations template for oslo.messaging. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the oslo.messaging +# project. +# +# Translators: +# Andi Chandler <andi(a)gowling.com>, 2014-2015 +msgid "" +msgstr "" +"Project-Id-Version: oslo.messaging\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-08-27 06:15+0000\n" +"PO-Revision-Date: 2015-08-27 00:55+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/" +"oslomessaging/language/en_GB/)\n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#, python-format +msgid "Failed to load any notifiers for %s" +msgstr "Failed to load any notifiers for %s" + +msgid "start/stop/wait must be called in the same thread" +msgstr "start/stop/wait must be called in the same thread" + +msgid "" +"wait() should be called after stop() as it waits for existing messages to " +"finish processing" +msgstr "" +"wait() should be called after stop() as it waits for existing messages to " +"finish processing" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# English (United Kingdom) translations for oslo.messaging. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.messaging -# project. -# -# Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2015 -msgid "" -msgstr "" -"Project-Id-Version: oslo.messaging\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:29+0000\n" -"PO-Revision-Date: 2015-08-03 21:07+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/" -"oslomessaging/language/en_GB/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" - -#, python-format -msgid "Exception during message handling: %s" -msgstr "Exception during message handling: %s" - -#, python-format -msgid "Failed to load any notifiers for %s" -msgstr "Failed to load any notifiers for %s" - -#, python-format -msgid "Routing '%(event)s' notification to '%(driver)s' driver" -msgstr "Routing '%(event)s' notification to '%(driver)s' driver" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po 2015-09-08 17:59:38.000000000 +0200 @@ -5,13 +5,14 @@ # # Translators: # Adriana Chisco Landazábal <achisco94(a)gmail.com>, 2015 +# Miriam Godinez <miriamgc(a)hotmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: oslo.messaging\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:29+0000\n" -"PO-Revision-Date: 2015-06-22 20:34+0000\n" -"Last-Translator: Adriana Chisco Landazábal <achisco94(a)gmail.com>\n" +"POT-Creation-Date: 2015-09-08 06:18+0000\n" +"PO-Revision-Date: 2015-09-07 22:46+0000\n" +"Last-Translator: Miriam Godinez <miriamgc(a)hotmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/openstack/oslomessaging/" "language/es/)\n" "Language: es\n" @@ -24,3 +25,7 @@ #, python-format msgid "An exception occurred processing the API call: %s " msgstr "Se ha producido una excepción al prcesar la llamada API: %s" + +#, python-format +msgid "Exception during message handling: %s" +msgstr "Excepción durante el manejo del mensaje: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po 2015-09-08 17:59:38.000000000 +0200 @@ -0,0 +1,26 @@ +# Translations template for oslo.messaging. +# Copyright (C) 2015 ORGANIZATION +# This file is distributed under the same license as the oslo.messaging +# project. +# +# Translators: +# Adriana Chisco Landazábal <achisco94(a)gmail.com>, 2015 +# Lucía Pradillos <dreamers_88(a)hotmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: oslo.messaging\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2015-08-26 06:33+0000\n" +"PO-Revision-Date: 2015-08-26 03:46+0000\n" +"Last-Translator: Lucía Pradillos <dreamers_88(a)hotmail.com>\n" +"Language-Team: Spanish (http://www.transifex.com/openstack/oslomessaging/" +"language/es/)\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "start/stop/wait must be called in the same thread" +msgstr "empezar/parar/esperar debe ser llamado en el mismo hilo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# Spanish translations for oslo.messaging. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.messaging -# project. -# -# Translators: -# Adriana Chisco Landazábal <achisco94(a)gmail.com>, 2015 -msgid "" -msgstr "" -"Project-Id-Version: oslo.messaging\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:29+0000\n" -"PO-Revision-Date: 2015-08-03 21:07+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: Spanish (http://www.transifex.com/openstack/oslomessaging/" -"language/es/)\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" - -#, python-format -msgid "Exception during message handling: %s" -msgstr "Excepción durante el manejo de mensaje: %s" - -#, python-format -msgid "Failed to load any notifiers for %s" -msgstr "No se puede cargar notificadores para %s" - -#, python-format -msgid "Routing '%(event)s' notification to '%(driver)s' driver" -msgstr "Notificación de enrutamiento '%(event)s' para controlador '%(driver)s'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po new/oslo.messaging-2.5.0/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po --- old/oslo.messaging-2.4.0/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -# French translations for oslo.messaging. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the oslo.messaging -# project. -# -# Translators: -# Jonathan Dupart <jonathan+transifex(a)dupart.org>, 2014 -# Lucas Mascaro <mascaro.lucas(a)yahoo.fr>, 2015 -# Maxime COQUEREL <max.coquerel(a)gmail.com>, 2014-2015 -msgid "" -msgstr "" -"Project-Id-Version: oslo.messaging\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-18 06:33+0000\n" -"PO-Revision-Date: 2015-08-17 15:20+0000\n" -"Last-Translator: openstackjenkins <jenkins(a)openstack.org>\n" -"Language-Team: French (http://www.transifex.com/openstack/oslomessaging/" -"language/fr/)\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" - -#, python-format -msgid "Exception during message handling: %s" -msgstr "Exception lors de la manipulation du message: %s" - -#, python-format -msgid "Failed to load any notifiers for %s" -msgstr "Echec de chargement des notifications pour %s" - -#, python-format -msgid "Routing '%(event)s' notification to '%(driver)s' driver" -msgstr "Routage '%(event)s' notification du pilote %(driver)s'" - -msgid "" -"wait() should be called after stop() as it waits for existing messages to " -"finish processing" -msgstr "" -"wait() devrai être appelé après stop() vu qu'il attend que les messages " -"existants aient fini d'être traités" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-error.pot new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-error.pot --- old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-error.pot 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-error.pot 2015-09-08 17:59:38.000000000 +0200 @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.messaging 2.1.0\n" +"Project-Id-Version: oslo.messaging 2.4.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-29 06:39+0000\n" +"POT-Creation-Date: 2015-08-26 06:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -23,3 +23,8 @@ msgid "An exception occurred processing the API call: %s " msgstr "" +#: oslo_messaging/rpc/dispatcher.py:150 +#, python-format +msgid "Exception during message handling: %s" +msgstr "" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-info.pot new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-info.pot --- old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-info.pot 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-info.pot 2015-09-08 17:59:38.000000000 +0200 @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.messaging 2.1.0\n" +"Project-Id-Version: oslo.messaging 2.4.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-07-29 06:39+0000\n" +"POT-Creation-Date: 2015-08-26 06:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -18,3 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.0\n" +#: oslo_messaging/notify/_impl_routing.py:117 +#, python-format +msgid "Routing '%(event)s' notification to '%(driver)s' driver" +msgstr "" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-warning.pot new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-warning.pot --- old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging-log-warning.pot 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging-log-warning.pot 2015-09-08 17:59:38.000000000 +0200 @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.messaging 2.2.1.dev10\n" +"Project-Id-Version: oslo.messaging 2.4.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-18 06:33+0000\n" +"POT-Creation-Date: 2015-08-26 06:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -18,7 +18,18 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.0\n" -#: oslo_messaging/server.py:146 +#: oslo_messaging/server.py:145 msgid "start/stop/wait must be called in the same thread" msgstr "" +#: oslo_messaging/server.py:178 +msgid "" +"wait() should be called after stop() as it waits for existing messages to" +" finish processing" +msgstr "" + +#: oslo_messaging/notify/_impl_routing.py:80 +#, python-format +msgid "Failed to load any notifiers for %s" +msgstr "" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging.pot new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging.pot --- old/oslo.messaging-2.4.0/oslo.messaging/locale/oslo.messaging.pot 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging/locale/oslo.messaging.pot 2015-09-08 17:59:38.000000000 +0200 @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.messaging 2.2.1.dev10\n" +"Project-Id-Version: oslo.messaging 2.4.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-18 06:33+0000\n" +"POT-Creation-Date: 2015-08-26 06:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -18,24 +18,3 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.0\n" -#: oslo_messaging/server.py:179 -msgid "" -"wait() should be called after stop() as it waits for existing messages to" -" finish processing" -msgstr "" - -#: oslo_messaging/notify/_impl_routing.py:80 -#, python-format -msgid "Failed to load any notifiers for %s" -msgstr "" - -#: oslo_messaging/notify/_impl_routing.py:117 -#, python-format -msgid "Routing '%(event)s' notification to '%(driver)s' driver" -msgstr "" - -#: oslo_messaging/rpc/dispatcher.py:150 -#, python-format -msgid "Exception during message handling: %s" -msgstr "" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging.egg-info/PKG-INFO new/oslo.messaging-2.5.0/oslo.messaging.egg-info/PKG-INFO --- old/oslo.messaging-2.4.0/oslo.messaging.egg-info/PKG-INFO 2015-08-24 23:36:13.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging.egg-info/PKG-INFO 2015-09-08 18:01:43.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslo.messaging -Version: 2.4.0 +Version: 2.5.0 Summary: Oslo Messaging API Home-page: https://launchpad.net/oslo Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging.egg-info/SOURCES.txt new/oslo.messaging-2.5.0/oslo.messaging.egg-info/SOURCES.txt --- old/oslo.messaging-2.4.0/oslo.messaging.egg-info/SOURCES.txt 2015-08-24 23:36:14.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging.egg-info/SOURCES.txt 2015-09-08 18:01:44.000000000 +0200 @@ -49,14 +49,13 @@ oslo.messaging/locale/oslo.messaging-log-info.pot oslo.messaging/locale/oslo.messaging-log-warning.pot oslo.messaging/locale/oslo.messaging.pot -oslo.messaging/locale/de/LC_MESSAGES/oslo.messaging.po oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-error.po -oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging.po +oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-info.po +oslo.messaging/locale/en_GB/LC_MESSAGES/oslo.messaging-log-warning.po oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-error.po -oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging.po +oslo.messaging/locale/es/LC_MESSAGES/oslo.messaging-log-warning.po oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging-log-error.po oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging-log-warning.po -oslo.messaging/locale/fr/LC_MESSAGES/oslo.messaging.po oslo.messaging/locale/ru/LC_MESSAGES/oslo.messaging-log-error.po oslo_messaging/__init__.py oslo_messaging/_i18n.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging.egg-info/pbr.json new/oslo.messaging-2.5.0/oslo.messaging.egg-info/pbr.json --- old/oslo.messaging-2.4.0/oslo.messaging.egg-info/pbr.json 2015-08-24 23:36:13.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging.egg-info/pbr.json 2015-09-08 18:01:43.000000000 +0200 @@ -1 +1 @@ -{"git_version": "b02dd25", "is_release": true} \ No newline at end of file +{"is_release": true, "git_version": "e9a1492"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo.messaging.egg-info/requires.txt new/oslo.messaging-2.5.0/oslo.messaging.egg-info/requires.txt --- old/oslo.messaging-2.4.0/oslo.messaging.egg-info/requires.txt 2015-08-24 23:36:13.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo.messaging.egg-info/requires.txt 2015-09-08 18:01:43.000000000 +0200 @@ -1,21 +1,21 @@ -pbr<2.0,>=1.4 -futurist>=0.1.2 # Apache-2.0 -oslo.config>=2.1.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -oslo.utils>=2.0.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.service>=0.6.0 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -stevedore>=1.5.0 # Apache-2.0 +pbr<2.0,>=1.6 +futurist>=0.1.2 +oslo.config>=2.3.0 +oslo.context>=0.2.0 +oslo.log>=1.8.0 +oslo.utils>=2.0.0 +oslo.serialization>=1.4.0 +oslo.service>=0.7.0 +oslo.i18n>=1.5.0 +stevedore>=1.5.0 six>=1.9.0 -cachetools>=1.0.0 # MIT License +cachetools>=1.0.0 eventlet>=0.17.4 greenlet>=0.3.2 WebOb>=1.2.3 PyYAML>=3.1.0 amqp>=1.4.0 kombu>=3.0.7 -oslo.middleware!=2.6.0,>=2.4.0 # Apache-2.0 +oslo.middleware>=2.8.0 aioeventlet>=0.4 trollius>=1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo_messaging/_drivers/protocols/amqp/controller.py new/oslo.messaging-2.5.0/oslo_messaging/_drivers/protocols/amqp/controller.py --- old/oslo.messaging-2.4.0/oslo_messaging/_drivers/protocols/amqp/controller.py 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo_messaging/_drivers/protocols/amqp/controller.py 2015-09-08 17:59:38.000000000 +0200 @@ -444,7 +444,7 @@ conn_props["x-ssl-ca-file"] = self.ssl_ca_file if self.ssl_cert_file: # assume this connection is for a server. If client authentication - # support is developed, we'll need an explict flag (server or + # support is developed, we'll need an explicit flag (server or # client) conn_props["x-ssl-server"] = True conn_props["x-ssl-identity"] = (self.ssl_cert_file, @@ -575,15 +575,16 @@ self._socket_connection.connection.close() def sasl_done(self, connection, pn_sasl, outcome): - """This is a Pyngus callback invoked by Pyngus when the SASL handshake - has completed. The outcome of the handshake will be OK on success or - AUTH on failure. - """ - if outcome == proton.SASL.AUTH: - LOG.error("Unable to connect to %s:%s, authentication failure.", - self.hosts.current.hostname, self.hosts.current.port) - # requires user intervention, treat it like a connection failure: - self._handle_connection_loss() + """This is a Pyngus callback invoked when the SASL handshake + has completed. The outcome of the handshake is passed in the outcome + argument. + """ + if outcome == proton.SASL.OK: + return + LOG.error("AUTHENTICATION FAILURE: Cannot connect to %s:%s as user %s", + self.hosts.current.hostname, self.hosts.current.port, + self.hosts.current.username) + # connection failure will be handled later def _complete_shutdown(self): """The AMQP Connection has closed, and the driver shutdown is complete. @@ -607,19 +608,18 @@ if not self._reconnecting: self._reconnecting = True self._replies = None - if self._delay == 0: - self._delay = 1 - self._do_reconnect() - else: - d = self._delay - LOG.info("delaying reconnect attempt for %d seconds", d) - self.processor.schedule(lambda: self._do_reconnect(), d) - self._delay = min(d * 2, 60) + d = self._delay + LOG.info("delaying reconnect attempt for %d seconds", d) + self.processor.schedule(lambda: self._do_reconnect(), d) + self._delay = 1 if self._delay == 0 else min(d * 2, 60) def _do_reconnect(self): """Invoked on connection/socket failure, failover and re-connect to the messaging service. """ + # note well: since this method destroys the connection, it cannot be + # invoked directly from a pyngus callback. Use processor.schedule() to + # run this method on the main loop instead. if not self._closing: self._reconnecting = False self._senders = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo_messaging/_drivers/protocols/amqp/eventloop.py new/oslo.messaging-2.5.0/oslo_messaging/_drivers/protocols/amqp/eventloop.py --- old/oslo.messaging-2.4.0/oslo_messaging/_drivers/protocols/amqp/eventloop.py 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo_messaging/_drivers/protocols/amqp/eventloop.py 2015-09-08 17:59:38.000000000 +0200 @@ -54,9 +54,7 @@ # Currently it is the Controller object. self._handler = handler self._container = container - c = container.create_connection(name, handler, self._properties) - c.user_context = self - self.connection = c + self.connection = None def _get_name_and_pid(self): # helps identify the process that is using the connection @@ -72,37 +70,31 @@ while True: try: rc = pyngus.read_socket_input(self.connection, self.socket) - if rc > 0: - self.connection.process(time.time()) + self.connection.process(time.time()) return rc - except socket.error as e: - if e.errno == errno.EAGAIN or e.errno == errno.EINTR: - continue - elif e.errno == errno.EWOULDBLOCK: - return 0 - else: - self._handler.socket_error(str(e)) - return pyngus.Connection.EOS + except (socket.timeout, socket.error) as e: + # pyngus handles EAGAIN/EWOULDBLOCK and EINTER + self.connection.close_input() + self.connection.close() + self._handler.socket_error(str(e)) + return pyngus.Connection.EOS def write(self): """Called when socket is write-ready.""" while True: try: rc = pyngus.write_socket_output(self.connection, self.socket) - if rc > 0: - self.connection.process(time.time()) + self.connection.process(time.time()) return rc - except socket.error as e: - if e.errno == errno.EAGAIN or e.errno == errno.EINTR: - continue - elif e.errno == errno.EWOULDBLOCK: - return 0 - else: - self._handler.socket_error(str(e)) - return pyngus.Connection.EOS + except (socket.timeout, socket.error) as e: + # pyngus handles EAGAIN/EWOULDBLOCK and EINTER + self.connection.close_output() + self.connection.close() + self._handler.socket_error(str(e)) + return pyngus.Connection.EOS def connect(self, host): - """Connect to host:port and start the AMQP protocol.""" + """Connect to host and start the AMQP protocol.""" addr = socket.getaddrinfo(host.hostname, host.port, socket.AF_INET, socket.SOCK_STREAM) if not addr: @@ -124,31 +116,46 @@ return self.socket = my_socket - # determine the proper SASL mechanism: PLAIN if a username/password is - # present, else ANONYMOUS - pn_sasl = self.connection.pn_sasl - if host.username: - password = host.password if host.password else "" - pn_sasl.plain(host.username, password) - else: - pn_sasl.mechanisms("ANONYMOUS") - # TODO(kgiusti): server if accepting inbound connections - pn_sasl.client() + props = self._properties.copy() + if pyngus.VERSION >= (2, 0, 0): + # configure client authentication + # + props['x-server'] = False + if host.username: + props['x-username'] = host.username + props['x-password'] = host.password or "" + + c = self._container.create_connection(self.name, self._handler, props) + c.user_context = self + self.connection = c + + if pyngus.VERSION < (2, 0, 0): + # older versions of pyngus requires manual SASL configuration: + # determine the proper SASL mechanism: PLAIN if a username/password + # is present, else ANONYMOUS + pn_sasl = self.connection.pn_sasl + if host.username: + password = host.password if host.password else "" + pn_sasl.plain(host.username, password) + else: + pn_sasl.mechanisms("ANONYMOUS") + # TODO(kgiusti): server if accepting inbound connections + pn_sasl.client() + self.connection.open() def reset(self, name=None): """Clean up the current state, expect 'connect()' to be recalled later. """ + # note well: since destroy() is called on the connection, do not invoke + # this method from a pyngus callback! if self.connection: self.connection.destroy() + self.connection = None self.close() if name: self.name = name - c = self._container.create_connection(self.name, self._handler, - self._properties) - c.user_context = self - self.connection = c def close(self): if self.socket: @@ -325,7 +332,6 @@ for r in readable: r.read() - self._schedule.process() # run any deferred requests for t in timers: if t.deadline > time.time(): break @@ -334,6 +340,8 @@ for w in writable: w.write() + self._schedule.process() # run any deferred requests + LOG.info("eventloop thread exiting, container=%s", self._container.name) self._container.destroy() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo_messaging/tests/functional/gate/post_test_hook.sh new/oslo.messaging-2.5.0/oslo_messaging/tests/functional/gate/post_test_hook.sh --- old/oslo.messaging-2.4.0/oslo_messaging/tests/functional/gate/post_test_hook.sh 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo_messaging/tests/functional/gate/post_test_hook.sh 2015-09-08 17:59:38.000000000 +0200 @@ -20,7 +20,7 @@ if [ -f .testrepository/0 ]; then sudo .tox/py27-func-${RPC_BACKEND}/bin/testr last --subunit > $WORKSPACE/testrepository.subunit sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit - sudo .tox/py27-func-${RPC_BACKEND}/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html + sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html sudo gzip -9 $BASE/logs/testrepository.subunit sudo gzip -9 $BASE/logs/testr_results.html sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/oslo_messaging/tests/test_amqp_driver.py new/oslo.messaging-2.5.0/oslo_messaging/tests/test_amqp_driver.py --- old/oslo.messaging-2.4.0/oslo_messaging/tests/test_amqp_driver.py 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/oslo_messaging/tests/test_amqp_driver.py 2015-09-08 17:59:38.000000000 +0200 @@ -15,13 +15,17 @@ import logging import os import select +import shutil import socket +import subprocess +import tempfile import threading import time import uuid from oslo_utils import importutils from six import moves +from string import Template import testtools import oslo_messaging @@ -295,9 +299,10 @@ driver.cleanup() -(a)testtools.skipUnless(pyngus, "proton modules not present") +(a)testtools.skipUnless(pyngus and pyngus.VERSION < (2, 0, 0), + "pyngus module not present") class TestAuthentication(test_utils.BaseTestCase): - + """Test user authentication using the old pyngus API""" def setUp(self): super(TestAuthentication, self).setUp() # for simplicity, encode the credentials as they would appear 'on the @@ -349,6 +354,89 @@ driver.cleanup() +(a)testtools.skipUnless(pyngus and pyngus.VERSION >= (2, 0, 0), + "pyngus module not present") +class TestCyrusAuthentication(test_utils.BaseTestCase): + """Test the driver's Cyrus SASL integration""" + + def setUp(self): + """Create a simple SASL configuration. This assumes saslpasswd2 is in + the OS path, otherwise the test will be skipped. + """ + super(TestCyrusAuthentication, self).setUp() + # Create a SASL configuration and user database, + # add a user 'joe' with password 'secret': + self._conf_dir = tempfile.mkdtemp() + db = os.path.join(self._conf_dir, 'openstack.sasldb') + _t = "echo secret | saslpasswd2 -c -p -f ${db} joe" + cmd = Template(_t).substitute(db=db) + try: + subprocess.call(args=cmd, shell=True) + except Exception: + shutil.rmtree(self._conf_dir, ignore_errors=True) + self._conf_dir = None + raise self.SkipTest("Cyrus tool saslpasswd2 not installed") + + # configure the SASL broker: + conf = os.path.join(self._conf_dir, 'openstack.conf') + mechs = "DIGEST-MD5 SCRAM-SHA-1 CRAM-MD5 PLAIN" + t = Template("""sasldb_path: ${db} +mech_list: ${mechs} +""") + with open(conf, 'w') as f: + f.write(t.substitute(db=db, mechs=mechs)) + + self._broker = FakeBroker(sasl_mechanisms=mechs, + user_credentials=["\0joe\0secret"], + sasl_config_dir=self._conf_dir, + sasl_config_name="openstack") + self._broker.start() + + def tearDown(self): + super(TestCyrusAuthentication, self).tearDown() + if self._broker: + self._broker.stop() + if self._conf_dir: + shutil.rmtree(self._conf_dir, ignore_errors=True) + + def test_authentication_ok(self): + """Verify that username and password given in TransportHost are + accepted by the broker. + """ + + addr = "amqp://joe:secret@%s:%d" % (self._broker.host, + self._broker.port) + url = oslo_messaging.TransportURL.parse(self.conf, addr) + driver = amqp_driver.ProtonDriver(self.conf, url) + target = oslo_messaging.Target(topic="test-topic") + listener = _ListenerThread(driver.listen(target), 1) + rc = driver.send(target, {"context": True}, + {"method": "echo"}, wait_for_reply=True) + self.assertIsNotNone(rc) + listener.join(timeout=30) + self.assertFalse(listener.isAlive()) + driver.cleanup() + + def test_authentication_failure(self): + """Verify that a bad password given in TransportHost is + rejected by the broker. + """ + + addr = "amqp://joe:badpass@%s:%d" % (self._broker.host, + self._broker.port) + url = oslo_messaging.TransportURL.parse(self.conf, addr) + driver = amqp_driver.ProtonDriver(self.conf, url) + target = oslo_messaging.Target(topic="test-topic") + _ListenerThread(driver.listen(target), 1) + self.assertRaises(oslo_messaging.MessagingTimeout, + driver.send, + target, {"context": True}, + {"method": "echo"}, + wait_for_reply=True, + timeout=2.0) + driver.cleanup() + + @testtools.skipUnless(pyngus, "proton modules not present") class TestFailover(test_utils.BaseTestCase): @@ -429,19 +517,33 @@ """A single AMQP connection.""" def __init__(self, server, socket_, name, - sasl_mechanisms, user_credentials): + sasl_mechanisms, user_credentials, + sasl_config_dir, sasl_config_name): """Create a Connection using socket_.""" self.socket = socket_ self.name = name self.server = server - self.connection = server.container.create_connection(name, - self) - self.connection.user_context = self self.sasl_mechanisms = sasl_mechanisms self.user_credentials = user_credentials - if sasl_mechanisms: - self.connection.pn_sasl.mechanisms(sasl_mechanisms) - self.connection.pn_sasl.server() + properties = {'x-server': True} + if self.sasl_mechanisms: + properties['x-sasl-mechs'] = self.sasl_mechanisms + if "ANONYMOUS" not in self.sasl_mechanisms: + properties['x-require-auth'] = True + if sasl_config_dir: + properties['x-sasl-config-dir'] = sasl_config_dir + if sasl_config_name: + properties['x-sasl-config-name'] = sasl_config_name + + self.connection = server.container.create_connection( + name, self, properties) + self.connection.user_context = self + if pyngus.VERSION < (2, 0, 0): + # older versions of pyngus don't recognize the sasl + # connection properties, so configure them manually: + if sasl_mechanisms: + self.connection.pn_sasl.mechanisms(sasl_mechanisms) + self.connection.pn_sasl.server() self.connection.open() self.sender_links = set() self.closed = False @@ -506,7 +608,8 @@ link_handle, addr) def sasl_step(self, connection, pn_sasl): - if self.sasl_mechanisms == 'PLAIN': + # only called if not using Cyrus SASL + if 'PLAIN' in self.sasl_mechanisms: credentials = pn_sasl.recv() if not credentials: return # wait until some arrives @@ -592,7 +695,9 @@ address_separator=".", sock_addr="", sock_port=0, sasl_mechanisms="ANONYMOUS", - user_credentials=None): + user_credentials=None, + sasl_config_dir=None, + sasl_config_name=None): """Create a fake broker listening on sock_addr:sock_port.""" if not pyngus: raise AssertionError("pyngus module not present") @@ -602,6 +707,8 @@ self._group_prefix = group_prefix + address_separator self._address_separator = address_separator self._sasl_mechanisms = sasl_mechanisms + self._sasl_config_dir = sasl_config_dir + self._sasl_config_name = sasl_config_name self._user_credentials = user_credentials self._wakeup_pipe = os.pipe() self._my_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -664,7 +771,9 @@ name = str(client_address) conn = FakeBroker.Connection(self, client_socket, name, self._sasl_mechanisms, - self._user_credentials) + self._user_credentials, + self._sasl_config_dir, + self._sasl_config_name) self._connections[conn.name] = conn elif r is self._wakeup_pipe[0]: os.read(self._wakeup_pipe[0], 512) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/requirements.txt new/oslo.messaging-2.5.0/requirements.txt --- old/oslo.messaging-2.4.0/requirements.txt 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/requirements.txt 2015-09-08 17:59:38.000000000 +0200 @@ -2,15 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=1.4 +pbr<2.0,>=1.6 futurist>=0.1.2 # Apache-2.0 -oslo.config>=2.1.0 # Apache-2.0 +oslo.config>=2.3.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 oslo.log>=1.8.0 # Apache-2.0 oslo.utils>=2.0.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0 -oslo.service>=0.6.0 # Apache-2.0 +oslo.service>=0.7.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0 @@ -35,7 +35,7 @@ kombu>=3.0.7 # middleware -oslo.middleware!=2.6.0,>=2.4.0 # Apache-2.0 +oslo.middleware>=2.8.0 # Apache-2.0 # needed by the aioeventlet executor aioeventlet>=0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/setup-test-env-qpid.sh new/oslo.messaging-2.5.0/setup-test-env-qpid.sh --- old/oslo.messaging-2.4.0/setup-test-env-qpid.sh 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/setup-test-env-qpid.sh 2015-09-08 17:59:38.000000000 +0200 @@ -1,4 +1,8 @@ #!/bin/bash +# +# Usage: setup-test-env-qpid.sh PROTOCOL <command to run> +# where PROTOCOL is the version of the AMQP protocol to use with +# qpidd. Valid values for PROTOCOL are "1", "1.0", "0-10", "0.10" set -e # require qpidd, qpid-tools sasl2-bin/cyrus-sasl-plain+cyrus-sasl-lib @@ -8,6 +12,34 @@ DATADIR=$(mktemp -d /tmp/OSLOMSG-QPID.XXXXX) trap "clean_exit $DATADIR" EXIT +QPIDD=$(which qpidd 2>/dev/null) + +# which protocol should be used with qpidd? +# 1 for AMQP 1.0, 0.10 for AMQP 0.10 +# +PROTOCOL=$1 +case $PROTOCOL in + "1" | "1.0") + PROTOCOL="1" + shift + ;; + "0.10" | "0-10") + PROTOCOL="0-10" + shift + ;; + *) + # assume the old protocol + echo "No protocol specified, assuming 0.10" + PROTOCOL="0-10" + ;; +esac + +# ensure that the version of qpidd does support AMQP 1.0 +if [ $PROTOCOL == "1" ] && ! `$QPIDD --help | grep -q "queue-patterns"`; then + echo "This version of $QPIDD does not support AMQP 1.0" + exit 1 +fi + [ -f "/usr/lib/qpid/daemon/acl.so" ] && LIBACL="load-module=/usr/lib/qpid/daemon/acl.so" cat > ${DATADIR}/qpidd.conf <<EOF @@ -18,12 +50,22 @@ mgmt-enable=yes auth=yes log-to-stderr=no +EOF +if [ $PROTOCOL == "1" ]; then + cat >> ${DATADIR}/qpidd.conf <<EOF # Used by AMQP1.0 only queue-patterns=exclusive queue-patterns=unicast topic-patterns=broadcast EOF + # some versions of qpidd require this for AMQP 1 and SASL: + if `$QPIDD --help | grep -q "sasl-service-name"`; then + cat >> ${DATADIR}/qpidd.conf <<EOF +sasl-service-name=amqp +EOF + fi +fi cat > ${DATADIR}/qpidd.acl <<EOF group admin stackqpid@QPID @@ -41,8 +83,6 @@ echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid -QPIDD=$(which qpidd 2>/dev/null) - mkfifo ${DATADIR}/out $QPIDD --log-enable info+ --log-to-file ${DATADIR}/out --config ${DATADIR}/qpidd.conf & wait_for_line "Broker .*running" "error" ${DATADIR}/out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.messaging-2.4.0/tox.ini new/oslo.messaging-2.5.0/tox.ini --- old/oslo.messaging-2.4.0/tox.ini 2015-08-24 23:33:43.000000000 +0200 +++ new/oslo.messaging-2.5.0/tox.ini 2015-09-08 17:59:38.000000000 +0200 @@ -26,7 +26,7 @@ [testenv:py27-func-qpid] setenv = TRANSPORT_URL=qpid://stackqpid:secretqpid@127.0.0.1:65123// -commands = {toxinidir}/setup-test-env-qpid.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' +commands = {toxinidir}/setup-test-env-qpid.sh 0-10 python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' [testenv:py27-func-rabbit] commands = {toxinidir}/setup-test-env-rabbit.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' @@ -34,7 +34,7 @@ [testenv:py27-func-amqp1] setenv = TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123// # NOTE(flaper87): This gate job run on fedora21 for now. -commands = {toxinidir}/setup-test-env-qpid.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' +commands = {toxinidir}/setup-test-env-qpid.sh 1.0 python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional' [testenv:py27-func-zeromq] commands = {toxinidir}/setup-test-env-zmq.sh python setup.py testr --slowest --testr-args='oslo_messaging.tests.functional'

1 0

commit python-neutronclient for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-neutronclient for openSUSE:Factory checked in at 2015-10-30 13:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-neutronclient (Old) and /work/SRC/openSUSE:Factory/.python-neutronclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-neutronclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-neutronclient/python-neutronclient.changes 2015-08-31 22:59:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-neutronclient.new/python-neutronclient.changes 2015-10-30 13:42:05.000000000 +0100 @@ -1,0 +2,57 @@ +Sun Oct 4 07:28:08 UTC 2015 - tbechtold(a)suse.com + +- update to 3.1.0: +* Updated from global requirements +* Revert "Remove Cisco-specific neutron client commands" +* Updated from global requirements +* Remove Cisco-specific neutron client commands + +------------------------------------------------------------------- +Mon Sep 14 09:24:46 UTC 2015 - tbechtold(a)suse.com + +- update to 3.0.0: + * Remove NEC plugin specific commands + * Update path to subunit2html in post_test_hook + * Updated from global requirements + * Add REJECT rule on FWaaS Client + * Update tls_container_id to tls_container_ref + * Updated from global requirements + * Support CLI changes for QoS (2/2) + * Support QoS neutron-client (1/2) + * Clear the extension requirement + * Updated from global requirements + * Make subnetpool-list show correct address scope column + * Fix find_resourceid_by_name call for address scopes + * Add extension name to extension's command help text line + * Adding registration interface for non_admin_status_resources + * Add document for entry point in setup.cfg + * Create hooks for running functional test + * Support Command line changes for Address Scope + * Remove --shared option from firewall-create + * Disable failing vpn tests + * Support RBAC neutron-client changes + * Remove newlines from request and response log + * Updated from global requirements + * Updated from global requirements + * Devref documentation for client command extension support + * Support CLI changes for associating subnetpools and address-scopes + * Remove unused AlreadyAttachedClient + * Avoid overwriting parsed_args + * Determine ip version during subnet create + * Call UnsetStub/VerifyAll properly for tests with exceptions + * Updated from global requirements + * Support resource plurals not ending in 's' + * Updated from global requirements + * Revert "Add '--router:external' option to 'net-create'" + * Updated from global requirements + * Updated from global requirements + * Fixes indentation for bash completion script + * Allow bash completion script to work with BSD sed + * Add alternative login description in neutronclient docs + * Updated from global requirements + * Raise user-friendly exceptions in str2dict + * LBaaS v2: Fix listing pool members + * Fix functional tests and tox 2.0 errors +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- python-neutronclient-2.6.0.tar.gz New: ---- python-neutronclient-3.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-neutronclient.spec ++++++ --- /var/tmp/diff_new_pack.jfZ52E/_old 2015-10-30 13:42:06.000000000 +0100 +++ /var/tmp/diff_new_pack.jfZ52E/_new 2015-10-30 13:42:06.000000000 +0100 @@ -19,7 +19,7 @@ %define component neutronclient Name: python-neutronclient -Version: 2.6.0 +Version: 3.1.0 Release: 0 Summary: Openstack Network (Quantum) API Client License: Apache-2.0 @@ -47,14 +47,14 @@ Requires: python >= 2.6.8 Requires: python-Babel >= 1.3 Requires: python-argparse -Requires: python-cliff >= 1.10.0 +Requires: python-cliff >= 1.14.0 Requires: python-iso8601 >= 0.1.9 -Requires: python-keystoneclient >= 1.3.0 +Requires: python-keystoneclient >= 1.6.0 Requires: python-netaddr >= 0.7.12 Requires: python-oslo.i18n >= 1.5.0 Requires: python-oslo.serialization >= 1.4.0 -Requires: python-oslo.utils >= 1.4.0 -Requires: python-pbr >= 0.11 +Requires: python-oslo.utils >= 2.0.0 +Requires: python-pbr >= 1.6 Requires: python-requests >= 2.5.2 Requires: python-simplejson >= 2.2.0 Requires: python-six >= 1.9.0 @@ -81,13 +81,13 @@ %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif -Requires: python-fixtures >= 0.3.14 -Requires: python-mock >= 1.0 +Requires: python-fixtures >= 1.3.1 +Requires: python-mock >= 1.2 Requires: python-python-subunit >= 0.0.18 Requires: python-requests-mock >= 0.6.0 -Requires: python-tempest-lib >= 0.5.0 +Requires: python-tempest-lib >= 0.8.0 Requires: python-testrepository >= 0.0.18 -Requires: python-testtools >= 0.9.36 +Requires: python-testtools >= 1.4.0 %description test This package contains testsuite files for %{name}. ++++++ python-neutronclient-2.6.0.tar.gz -> python-neutronclient-3.1.0.tar.gz ++++++ ++++ 4403 lines of diff (skipped)

1 0

commit python-ceilometerclient for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-ceilometerclient for openSUSE:Factory checked in at 2015-10-30 13:42:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ceilometerclient (Old) and /work/SRC/openSUSE:Factory/.python-ceilometerclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ceilometerclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ceilometerclient/python-ceilometerclient.changes 2015-09-02 07:53:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ceilometerclient.new/python-ceilometerclient.changes 2015-10-30 13:42:02.000000000 +0100 @@ -1,0 +2,65 @@ +Mon Sep 14 09:29:14 UTC 2015 - tbechtold(a)suse.com + +- update to 1.5.0: + * add limit support + * do not generate meter links on resource-list + * refactor: move 'repeat_actions' to common args + * Support alarm-event-{create,update} + * Use new location of subunit2html + * Updated from global requirements + * Don't try to get aodh endpoint if auth_url didn't provided + * Updated from global requirements + * tenant_id not required with keystone v3 + * Updated from global requirements + * Add support for client redirecting to aodh endpoint if available + * Updated from global requirements + * Updated from global requirements + * Fix unit tests failing caused by new Mock release + * Updated from global requirements + * Add ceilometerclient support for api-no-pipeline + * Change default values from [] to None + * Typo: Show an sample => Show a sample + * Add alarm severity in alarm-history output + * Updated from global requirements + * Explicit error for wrong resource metadata format + * Removes whitespace from CLI queries + * Add capability for creating array of samples + * Updated from global requirements + * Drop use of 'oslo' namespace package + * Pass OS_* env vars fix for tox 2.0 + * Catch missing 404 exceptions in client + * Use oslo_utils instead of deprecated oslo.utils + * [unittest] Increase client and shell modules cover + * Fix alarm-evaluator can't start when ssl was enabled + * Updated from global requirements + * Updated from global requirements + * remove useless event unit test code + * Allow changing project-id and user-id by alarm-threshold-update + * move capabilities ut code to unit dir + * show raw details of event + * Uncap library requirements for liberty + * update README.rst to help release process + * Add timeout for keystoneclient session + * add region_name to auth plugin parameters + * Added missing ceilometer CLI tests + * Updates examples to reference new sample format + * ceilometerclient insecure argument no longer works + * fix client docstring + * Add CLI for Capabilities REST API + * print user friendly error message for alarm update time constraints + * ceilometerclient fails with keystone v3 auth + * Updated from global requirements + * Set auth_plugin in __init__ + * support specify user-id when create sample and alarm + * add in missing options + * Add a post_test_hook for gate-run functional tests + * Add cli functional tests from tempest + * alarm: Use new gnocchi aggregation API + * Move unit tests into their own subdirectory + * Add a py34 target for tox + * Fixes bug with Client function not setting up SSL params + * Updated from global requirements + * Enable specified project_id in CLI commands +- Adjust Requires according to requirements.txt + +------------------------------------------------------------------- Old: ---- python-ceilometerclient-1.0.13.tar.gz New: ---- python-ceilometerclient-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ceilometerclient.spec ++++++ --- /var/tmp/diff_new_pack.akXLD7/_old 2015-10-30 13:42:03.000000000 +0100 +++ /var/tmp/diff_new_pack.akXLD7/_new 2015-10-30 13:42:03.000000000 +0100 @@ -19,7 +19,7 @@ %define component ceilometerclient Name: python-%{component} -Version: 1.0.13 +Version: 1.5.0 Release: 0 Url: https://github.com/openstack/python-ceilometerclient Summary: OpenStack Metering (Ceilometer) API Client @@ -33,8 +33,13 @@ Requires: python-PrettyTable >= 0.7 Requires: python-argparse Requires: python-iso8601 >= 0.1.9 -Requires: python-keystoneclient >= 1.1.0 -Requires: python-six >= 1.7.0 +Requires: python-keystoneclient >= 1.6.0 +Requires: python-oslo.i18n >= 1.5.0 +Requires: python-oslo.serialization >= 1.4.0 +Requires: python-oslo.utils >= 2.0.0 +Requires: python-requests >= 2.5.2 +Requires: python-six >= 1.9.0 +Requires: python-stevedore >= 1.5.0 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -53,11 +58,12 @@ %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover %endif -Requires: python-fixtures >= 0.3.14 -Requires: python-mock >= 1.0 +Requires: python-fixtures >= 1.3.1 +Requires: python-mock >= 1.2 Requires: python-python-subunit >= 0.0.18 +Requires: python-tempest-lib >= 0.6.1 Requires: python-testrepository >= 0.0.18 -Requires: python-testtools >= 0.9.36 +Requires: python-testtools >= 1.4.0 %description test This package contains testsuite files for %{name}. ++++++ python-ceilometerclient-1.0.13.tar.gz -> python-ceilometerclient-1.5.0.tar.gz ++++++ ++++ 11965 lines of diff (skipped)

1 0

commit python-heatclient for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python-heatclient for openSUSE:Factory checked in at 2015-10-30 13:41:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-heatclient (Old) and /work/SRC/openSUSE:Factory/.python-heatclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-heatclient" Changes: -------- --- /work/SRC/openSUSE:Factory/python-heatclient/python-heatclient.changes 2015-08-27 08:55:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-heatclient.new/python-heatclient.changes 2015-10-30 13:42:01.000000000 +0100 @@ -1,0 +2,82 @@ +Sat Sep 19 07:01:26 UTC 2015 - tbechtold(a)suse.com + +- update to 0.8.0: + * stack-update -x tolerate no template + * Ability to specify show_nested for template validation + * Fix deployment create error when using existing config + * Fix stack sorting support + * Enable filters for heat resource-type-list + * Modify test templates and the path to subunit2html + * Add CLI option for update dry-run + * Add py34 env to default tox run + +------------------------------------------------------------------- +Mon Sep 14 09:42:08 UTC 2015 - tbechtold(a)suse.com + +- update to 0.7.0: + * Fix a nit in resource-list help + * Replace deprecated function + * Updated from global requirements + * Improve the format hint of -Pf option + * Support tags parameter for stack-preview + * Do not show snapshot data when doing snapshot-list + * Updated from global requirements + * Poll functionality for stack create action + * Updated from global requirements + * Use Heat resource to validate resource_type_show + * Update python3 classifiers + * Updated from global requirements + * Updated from global requirements + * add with_detail parameter in heat resource-list request + * Fix docstrings and add missing + * Add missing `deployment-list` to cli + * Updated from global requirements + * Support 'with_attr' parameter for resource-show + * Updated from global requirements + * New mock release(1.1.0) broke unit tests + * Fix error when creating deployment from cli + * Add support for template-function-list command + * Fix TypeError when call keystoneclient session.request() + * Add support for template-version-list command + * Add tests for SessionClient + * Updated from global requirements + * Move SessionClient from HTTPClient to adapter + * resource-list --nested-depth stack_name column + * Fix argument order for assertEqual + * Updated from global requirements + * Fixed VerifyAll() when test case does ReplayAll() + * Updated from global requirements + * Move test_event_utils.py module to unit directory + * Add first pass at post_test_hook for functional + * cleanup openstack-common.conf and sync updated files + * Move usage methods *_request to get/post/etc + * Updated from global requirements + * Add functional tests from Tempest + * Update hacking version to fix pep8 gate job + * Adds --format=log option to event-list + * Add --tags option to stack-create and stack-update + * Add stack tag filtering options to stack-list + * Add OS_TEST_PATH to testr + * Move unittests to subdir unit + * Updated from global requirements + * Make hook type optional for hook-clear + * Refactor common event code into event_utils module + * Add hook-poll function to check if a stack has pending hooks + * Work around pypy testing issue + * Implement --limit option for event-list with --nested-depth + * event-list marker, only slice when needed + * Add option to show hidden stacks in stack-list + * Add an option to generate template based on resource type + * Updated from global requirements + * Implement --marker for event-list --nested-depth + * Fix sort column for event-list with nested-depth + * Unit tests for stack actions + * correction in function names under test_resource + * Uncap library requirements for liberty + * Add --nested-depth option to event-list + * Make README.rst comply with expected format + * Remove the deprecated shell commands +- Adjust Requires according to requirements.txt +- Add python_requires to _service file + +------------------------------------------------------------------- Old: ---- python-heatclient-0.4.0.tar.gz New: ---- python-heatclient-0.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-heatclient.spec ++++++ --- /var/tmp/diff_new_pack.RS1pv2/_old 2015-10-30 13:42:02.000000000 +0100 +++ /var/tmp/diff_new_pack.RS1pv2/_new 2015-10-30 13:42:02.000000000 +0100 @@ -19,7 +19,7 @@ %define component heatclient Name: python-%{component} -Version: 0.4.0 +Version: 0.8.0 Release: 0 Summary: OpenStack Orchestration (Heat) API Client License: Apache-2.0 @@ -38,14 +38,19 @@ BuildRequires: python-oslosphinx BuildRequires: python-pbr Requires: python >= 2.6.8 +Requires: python-Babel >= 1.3 Requires: python-PrettyTable >= 0.7 Requires: python-PyYAML >= 3.1.0 Requires: python-argparse -Requires: python-iso8601 >= 0.1.8 -Requires: python-keystoneclient >= 0.4.2 -Requires: python-pbr >= 0.5.21 -Requires: python-requests >= 1.1 -Requires: python-six >= 1.4.1 +Requires: python-iso8601 >= 0.1.9 +Requires: python-keystoneclient >= 1.6.0 +Requires: python-oslo.i18n >= 1.5.0 +Requires: python-oslo.serialization >= 1.4.0 +Requires: python-oslo.utils >= 2.0.0 +Requires: python-pbr >= 1.6 +Requires: python-requests >= 2.5.2 +Requires: python-six >= 1.9.0 +Requires: python-swiftclient >= 2.2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -69,16 +74,15 @@ Summary: OpenStack Orchestration (Heat) API Client - Testsuite Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: python-coverage >= 3.6 -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -Requires: python-discover -%endif -Requires: python-fixtures >= 0.3.14 -Requires: python-mock >= 1.0 +Requires: python-fixtures >= 1.3.1 +Requires: python-mock >= 1.2 Requires: python-mox3 >= 0.7.0 -Requires: python-testrepository >= 0.0.17 +Requires: python-oslotest >= 1.10.0 +Requires: python-requests-mock >= 0.6.0 +Requires: python-tempest-lib >= 0.6.1 +Requires: python-testrepository >= 0.0.18 Requires: python-testscenarios >= 0.4 -Requires: python-testtools >= 0.9.32 +Requires: python-testtools >= 1.4.0 %description test This package contains testsuite files for %{name}. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RS1pv2/_old 2015-10-30 13:42:02.000000000 +0100 +++ /var/tmp/diff_new_pack.RS1pv2/_new 2015-10-30 13:42:02.000000000 +0100 @@ -1,10 +1,12 @@ <services> - <service mode="disabled" name="download_files"> + <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="set_version"> <param name="basename">python-heatclient</param> </service> + <service mode="disabled" name="python_requires"> + </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> ++++++ python-heatclient-0.4.0.tar.gz -> python-heatclient-0.8.0.tar.gz ++++++ ++++ 19822 lines of diff (skipped)

1 0

commit python3-certifi for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package python3-certifi for openSUSE:Factory checked in at 2015-10-30 13:41:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-certifi (Old) and /work/SRC/openSUSE:Factory/.python3-certifi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-certifi" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-certifi/python3-certifi.changes 2015-09-30 05:52:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-certifi.new/python3-certifi.changes 2015-10-30 13:41:55.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Oct 27 09:40:34 UTC 2015 - toddrme2178(a)gmail.com + +- Fix certificate handling on openSUSE 13.1. + +------------------------------------------------------------------- +Mon Oct 26 11:03:46 UTC 2015 - toddrme2178(a)gmail.com + +- Depend on certificates. The package is useless without them. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-certifi.spec ++++++ --- /var/tmp/diff_new_pack.87qc4P/_old 2015-10-30 13:41:56.000000000 +0100 +++ /var/tmp/diff_new_pack.87qc4P/_new 2015-10-30 13:41:56.000000000 +0100 @@ -27,6 +27,14 @@ Patch0: python3-certifi-shipped-requests-cabundle.patch BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: ca-certificates +Requires: ca-certificates +%if 0%{?suse_version} <= 1310 +BuildRequires: ca-certificates-cacert +BuildRequires: ca-certificates-mozilla +Requires: ca-certificates-cacert +Requires: ca-certificates-mozilla +%endif BuildArch: noarch %description

1 0

commit kscreen5 for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package kscreen5 for openSUSE:Factory checked in at 2015-10-30 13:41:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kscreen5 (Old) and /work/SRC/openSUSE:Factory/.kscreen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kscreen5" Changes: -------- --- /work/SRC/openSUSE:Factory/kscreen5/kscreen5.changes 2015-10-19 22:17:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kscreen5.new/kscreen5.changes 2015-10-30 13:41:51.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 26 15:39:36 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Added fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch + (kde#344651, boo#951933) + +------------------------------------------------------------------- New: ---- fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kscreen5.spec ++++++ --- /var/tmp/diff_new_pack.in5OhK/_old 2015-10-30 13:41:51.000000000 +0100 +++ /var/tmp/diff_new_pack.in5OhK/_new 2015-10-30 13:41:51.000000000 +0100 @@ -26,6 +26,8 @@ Url: http://www.kde.org Source: kscreen-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch +Patch0: fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.6.0 BuildRequires: fdupes @@ -69,6 +71,7 @@ %lang_package %prep %setup -q -n kscreen-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ fix-crash-when-exiting-kscreen-kcm-in-systemsettings.patch ++++++ From: Martin Gräßlin <mgraesslin(a)kde.org> Date: Wed, 21 Oct 2015 08:30:58 +0000 Subject: Fix crash when exiting kscreen kcm in systemsettings X-Git-Url: http://quickgit.kde.org/?p=kscreen.git&a=commitdiff&h=4653c287f844f2cb19379… --- Fix crash when exiting kscreen kcm in systemsettings When using threaded rendering loop [1] systemsettings crashed when clicking the back button. This crash is caused inside the shader effect used by the OpacityMask. QtQuick informed us also that something is wrong: "QSGDefaultLayer::bind: ShaderEffectSource: 'recursive' must be set to true when rendering recursively." The actual problem is that orientationPanelContainer and the OpacityMask are children to the monitor item causing recursion. By making them siblings to the orientationPanelContainer the problem is resolved. The error message from QtQuick is no longer shown and systemsettings doesn't crash any more. BUG: 344651 FIXED-IN: 5.4.3 REVIEW: 125734 [1] QSG_RENDER_LOOP=threaded systemsettings5 --- --- a/kcm/qml/Output.qml +++ b/kcm/qml/Output.qml @@ -249,40 +249,39 @@ } } } - - Item { - id: orientationPanelContainer; - - anchors.fill: monitor; - - visible: false - - Rectangle { - id: orientationPanel; - - anchors { - left: parent.left; - right: parent.right; - bottom: parent.bottom; - } - - height: 10; - color: root.focus ? palette.highlight : palette.shadow; - smooth: true; - - Behavior on color { - PropertyAnimation { - duration: 150; - } - } - } - } - - OpacityMask { - anchors.fill: orientationPanelContainer; - source: orientationPanelContainer; - maskSource: monitor; - } + } + Item { + id: orientationPanelContainer; + + anchors.fill: monitor; + + visible: false + + Rectangle { + id: orientationPanel; + + anchors { + left: parent.left; + right: parent.right; + bottom: parent.bottom; + } + + height: 10; + color: root.focus ? palette.highlight : palette.shadow; + smooth: true; + + Behavior on color { + PropertyAnimation { + duration: 150; + } + } + } + } + + OpacityMask { + anchors.fill: orientationPanelContainer; + source: orientationPanelContainer; + maskSource: monitor; } }

1 0

commit plasma5-desktop for openSUSE:Factory
by root＠hilbert.suse.de 30 Oct '15

30 Oct '15

Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2015-10-30 13:41:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2015-10-19 22:19:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2015-10-30 13:41:46.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 26 15:45:32 UTC 2015 - hrvoje.senjan(a)gmail.com + +- Provide and Obsolete calendar and akonadi components from + kdebase4-workspace so upgrades from earlier openSUSE versions + go smoother + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.sWrWZl/_old 2015-10-30 13:41:47.000000000 +0100 +++ /var/tmp/diff_new_pack.sWrWZl/_new 2015-10-30 13:41:47.000000000 +0100 @@ -109,6 +109,10 @@ Obsoletes: kdebase4-workspace < 5.3.0 Provides: kcm-touchpad = %{version} Obsoletes: kcm-touchpad < %{version} +Provides: kdebase4-workspace-plasma-calendar = %{version} +Obsoletes: kdebase4-workspace-plasma-calendar < %{version} +Provides: kdebase4-workspace-plasma-engine-akonadi = %{version} +Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version} %else Conflicts: kdebase4-workspace Conflicts: kcm-touchpad

1 0