openstack/shade
Code Issues Proposed changes

Remove designate client from shade's dependencies

Browse Source 
All calls to Designate API are now done with REST calls made
via keystoneauth1
Shade don't require python-designateclient package since now.

Change-Id: I55393dc04ec9eeaba885fee849e6466f199be479
This commit is contained in:
Sławek Kapłoński 2017-06-02 16:48:03 +00:00
parent 637a1a893c
commit 10cb4f2d59
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extras/install-tips.sh
View File

@ -18,7 +18,6 @@ for lib in \
python-novaclient \ python-novaclient \
python-keystoneclient \ python-keystoneclient \
python-ironicclient \ python-ironicclient \
python-designateclient \
os-client-config \ os-client-config \
keystoneauth keystoneauth
do do

3
requirements.txt
View File

@ -14,8 +14,6 @@ os-client-config>=1.27.0 # Apache-2.0
# Babel can be removed when ironicclient is removed (because of openstackclient # Babel can be removed when ironicclient is removed (because of openstackclient
# transitive depend) # transitive depend)
Babel!=2.4.0,>=2.3.4 # BSD Babel!=2.4.0,>=2.3.4 # BSD
# requests can be removed when designateclient is removed
requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
requestsexceptions>=1.2.0 # Apache-2.0 requestsexceptions>=1.2.0 # Apache-2.0
six>=1.9.0 # MIT six>=1.9.0 # MIT
futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
@ -26,6 +24,5 @@ netifaces>=0.10.4 # MIT
python-novaclient>=7.1.0 # Apache-2.0 python-novaclient>=7.1.0 # Apache-2.0
python-keystoneclient>=3.8.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0
python-ironicclient>=1.11.0 # Apache-2.0 python-ironicclient>=1.11.0 # Apache-2.0
python-designateclient>=1.5.0 # Apache-2.0
dogpile.cache>=0.6.2 # BSD dogpile.cache>=0.6.2 # BSD

2
shade/_legacy_clients.py
View File

@ -86,7 +86,7 @@ class LegacyClientFactoryMixin(object):
@property @property
def designate_client(self): def designate_client(self):
return self._create_legacy_client('designate', 'dns', deprecated=False) return self._create_legacy_client('designate', 'dns')
@property @property
def keystone_client(self): def keystone_client(self):

15
shade/tests/unit/base.py
View File

@ -477,12 +477,6 @@ class RequestsMockTestCase(BaseTestCase):
status_code=300, status_code=300,
text=open(discovery_fixture, 'r').read()) text=open(discovery_fixture, 'r').read())
def get_designate_discovery_mock_dict(self):
discovery_fixture = os.path.join(
self.fixtures_directory, "dns.json")
return dict(method='GET', uri="https://dns.example.com/",
text=open(discovery_fixture, 'r').read())
def use_glance(self, image_version_json='image-version.json'): def use_glance(self, image_version_json='image-version.json'):
# NOTE(notmorgan): This method is only meant to be used in "setUp" # NOTE(notmorgan): This method is only meant to be used in "setUp"
# where the ordering of the url being registered is tightly controlled # where the ordering of the url being registered is tightly controlled
@ -492,15 +486,6 @@ class RequestsMockTestCase(BaseTestCase):
self.__do_register_uris([ self.__do_register_uris([
self.get_glance_discovery_mock_dict(image_version_json)]) self.get_glance_discovery_mock_dict(image_version_json)])
def use_designate(self):
# NOTE(slaweq): This method is only meant to be used in "setUp"
# where the ordering of the url being registered is tightly controlled
# if the functionality of .use_designate is meant to be used during an
# actual test case, use .get_designate_discovery_mock and apply to the
# right location in the mock_uris when calling .register_uris
self.__do_register_uris([
self.get_designate_discovery_mock_dict()])
def register_uris(self, uri_mock_list=None): def register_uris(self, uri_mock_list=None):
"""Mock a list of URIs and responses via requests mock. """Mock a list of URIs and responses via requests mock.