Removal of netloc filters
The ansible urlsplit filter added in 2.4 means that maintaining the filters netloc, netloc_no_port and netorigin should no longer be necessary. All usages of these filters within other openstack repos have been updated to use urlsplit and merged. Change-Id: Ief1ec06e205bae7ec114fe0b9bd7d9c4973383dd Closes-Bug: #1820830
This commit is contained in:
parent
5cdb163ffb
commit
6482c25017
|
@ -80,33 +80,6 @@ user after removing any duplicates found within the second list.
|
||||||
{{ ['a', 'b'] | filtered_list(['b', 'c']) }}
|
{{ ['a', 'b'] | filtered_list(['b', 'c']) }}
|
||||||
# => [ "a" ]
|
# => [ "a" ]
|
||||||
|
|
||||||
netloc
|
|
||||||
~~~~~~
|
|
||||||
This filter will return the netloc from a given URL.
|
|
||||||
|
|
||||||
.. code-block:: yaml
|
|
||||||
|
|
||||||
{{ 'https://172.29.236.100:5000/v3/auth/tokens' | netloc }}
|
|
||||||
# => "172.29.236.100:5000"
|
|
||||||
|
|
||||||
netloc_no_port
|
|
||||||
~~~~~~~~~~~~~~
|
|
||||||
This filter will return the netloc, without a port, from a given URL.
|
|
||||||
|
|
||||||
.. code-block:: yaml
|
|
||||||
|
|
||||||
{{ 'https://172.29.236.100:5000/v3/auth/tokens' | netloc_no_port }}
|
|
||||||
# => "172.29.236.100"
|
|
||||||
|
|
||||||
netorigin
|
|
||||||
~~~~~~~~~
|
|
||||||
This filter will return the scheme and netloc from a given URL.
|
|
||||||
|
|
||||||
.. code-block:: yaml
|
|
||||||
|
|
||||||
{{ 'https://172.29.236.100:5000/v3/auth/tokens' | netorigin }}
|
|
||||||
# => "https://172.29.236.100:5000"
|
|
||||||
|
|
||||||
pip_constraint_update
|
pip_constraint_update
|
||||||
~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~
|
||||||
This filter will return a merged list from a given list of pip packages and a
|
This filter will return a merged list from a given list of pip packages and a
|
||||||
|
|
|
@ -152,68 +152,6 @@ def bit_length_power_of_2(value):
|
||||||
"""
|
"""
|
||||||
return 2**(int(value)-1).bit_length()
|
return 2**(int(value)-1).bit_length()
|
||||||
|
|
||||||
|
|
||||||
def get_netloc(url):
|
|
||||||
"""Return the netloc from a URL.
|
|
||||||
|
|
||||||
If the input value is not a value URL the method will raise an Ansible
|
|
||||||
filter exception.
|
|
||||||
|
|
||||||
:param url: the URL to parse
|
|
||||||
:type url: ``str``
|
|
||||||
:returns: ``str``
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
netloc = urlparse(url).netloc
|
|
||||||
except Exception as exp:
|
|
||||||
raise errors.AnsibleFilterError(
|
|
||||||
'Failed to return the netloc of: "%s"' % str(exp)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
return netloc
|
|
||||||
|
|
||||||
|
|
||||||
def get_netloc_no_port(url):
|
|
||||||
"""Return the netloc without a port from a URL.
|
|
||||||
|
|
||||||
If the input value is not a value URL the method will raise an Ansible
|
|
||||||
filter exception.
|
|
||||||
|
|
||||||
:param url: the URL to parse
|
|
||||||
:type url: ``str``
|
|
||||||
:returns: ``str``
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
hostname = urlparse(url).hostname
|
|
||||||
except Exception as exp:
|
|
||||||
raise errors.AnsibleFilterError(
|
|
||||||
'Failed to return the hostname of: "%s"' % str(exp)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
return hostname
|
|
||||||
|
|
||||||
def get_netorigin(url):
|
|
||||||
"""Return the netloc from a URL.
|
|
||||||
|
|
||||||
If the input value is not a value URL the method will raise an Ansible
|
|
||||||
filter exception.
|
|
||||||
|
|
||||||
:param url: the URL to parse
|
|
||||||
:type url: ``str``
|
|
||||||
:returns: ``str``
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
parsed_url = urlparse(url)
|
|
||||||
netloc = parsed_url.netloc
|
|
||||||
scheme = parsed_url.scheme
|
|
||||||
except Exception as exp:
|
|
||||||
raise errors.AnsibleFilterError(
|
|
||||||
'Failed to return the netorigin of: "%s"' % str(exp)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
return '%s://%s' % (scheme, netloc)
|
|
||||||
|
|
||||||
|
|
||||||
def string_2_int(string):
|
def string_2_int(string):
|
||||||
"""Return the an integer from a string.
|
"""Return the an integer from a string.
|
||||||
|
|
||||||
|
@ -331,9 +269,6 @@ class FilterModule(object):
|
||||||
def filters():
|
def filters():
|
||||||
return {
|
return {
|
||||||
'bit_length_power_of_2': bit_length_power_of_2,
|
'bit_length_power_of_2': bit_length_power_of_2,
|
||||||
'netloc': get_netloc,
|
|
||||||
'netloc_no_port': get_netloc_no_port,
|
|
||||||
'netorigin': get_netorigin,
|
|
||||||
'string_2_int': string_2_int,
|
'string_2_int': string_2_int,
|
||||||
'pip_requirement_names': pip_requirement_names,
|
'pip_requirement_names': pip_requirement_names,
|
||||||
'pip_constraint_update': pip_constraint_update,
|
'pip_constraint_update': pip_constraint_update,
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
Removal of the netloc, netloc_no_port and netorigin filters.
|
||||||
|
Please use the urlsplit filter instead.
|
||||||
|
All usages of the deprecated filters in openstack repos have been updated.
|
|
@ -26,20 +26,6 @@
|
||||||
- "{{ 1024 | bit_length_power_of_2 }} == 1024"
|
- "{{ 1024 | bit_length_power_of_2 }} == 1024"
|
||||||
- "{{ 9600 | bit_length_power_of_2 }} == 16384"
|
- "{{ 9600 | bit_length_power_of_2 }} == 16384"
|
||||||
|
|
||||||
- name: Set net filter facts
|
|
||||||
set_fact:
|
|
||||||
url_netloc: "{{ 'http://review.openstack.org:29418/something' | netloc }}"
|
|
||||||
url_netloc_no_port: "{{ 'http://review.openstack.org:29418/something' | netloc_no_port }}"
|
|
||||||
url_netloc_no_port_with_auth: "{{ 'http://user:secrete@review.openstack.org:29418/something' | netloc_no_port }}"
|
|
||||||
url_netorigin: "{{ 'http://review.openstack.org:29418/something' | netorigin }}"
|
|
||||||
- name: Validate net filters
|
|
||||||
assert:
|
|
||||||
that:
|
|
||||||
- "url_netloc == 'review.openstack.org:29418'"
|
|
||||||
- "url_netloc_no_port == 'review.openstack.org'"
|
|
||||||
- "url_netloc_no_port_with_auth == 'review.openstack.org'"
|
|
||||||
- "url_netorigin == 'http://review.openstack.org:29418'"
|
|
||||||
|
|
||||||
- name: Validate string_2_int filter
|
- name: Validate string_2_int filter
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
|
|
Loading…
Reference in New Issue