diff --git a/extras/install-tips.sh b/extras/install-tips.sh index 7af026d8b..50c2fd8da 100644 --- a/extras/install-tips.sh +++ b/extras/install-tips.sh @@ -18,7 +18,6 @@ for lib in \ python-novaclient \ python-keystoneclient \ python-ironicclient \ - python-designateclient \ os-client-config \ keystoneauth do diff --git a/requirements.txt b/requirements.txt index 6a6bdab10..10eaa12dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,8 +14,6 @@ os-client-config>=1.27.0 # Apache-2.0 # Babel can be removed when ironicclient is removed (because of openstackclient # transitive depend) 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 six>=1.9.0 # MIT 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-keystoneclient>=3.8.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 diff --git a/shade/_legacy_clients.py b/shade/_legacy_clients.py index f34261593..cbf807bcd 100644 --- a/shade/_legacy_clients.py +++ b/shade/_legacy_clients.py @@ -86,7 +86,7 @@ class LegacyClientFactoryMixin(object): @property def designate_client(self): - return self._create_legacy_client('designate', 'dns', deprecated=False) + return self._create_legacy_client('designate', 'dns') @property def keystone_client(self): diff --git a/shade/tests/unit/base.py b/shade/tests/unit/base.py index c0d635d97..42ce66831 100644 --- a/shade/tests/unit/base.py +++ b/shade/tests/unit/base.py @@ -477,12 +477,6 @@ class RequestsMockTestCase(BaseTestCase): status_code=300, 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'): # NOTE(notmorgan): This method is only meant to be used in "setUp" # where the ordering of the url being registered is tightly controlled @@ -492,15 +486,6 @@ class RequestsMockTestCase(BaseTestCase): self.__do_register_uris([ 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): """Mock a list of URIs and responses via requests mock.