From 255523c63d4d843be632b73eeab98e2b6f408470 Mon Sep 17 00:00:00 2001 From: Graham Hayes Date: Tue, 29 Mar 2016 13:49:02 +0100 Subject: [PATCH] Move all V2 Controllers to inherit from the v2 Previously some v2 controllers inherited from the base client.Controller. Fixes have been added to the V2Controller that allow it to work with lists + next links. Change-Id: I23b4ecc52b71cafc4085ab6586164bd03ac6afea --- designateclient/v2/base.py | 2 +- designateclient/v2/blacklists.py | 4 ++-- designateclient/v2/limits.py | 4 ++-- designateclient/v2/nameservers.py | 4 ++-- designateclient/v2/reverse.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/designateclient/v2/base.py b/designateclient/v2/base.py index 16d47c4..1700c82 100644 --- a/designateclient/v2/base.py +++ b/designateclient/v2/base.py @@ -40,4 +40,4 @@ class V2Controller(client.Controller): return data - return body \ No newline at end of file + return body diff --git a/designateclient/v2/blacklists.py b/designateclient/v2/blacklists.py index f1d5747..102c018 100644 --- a/designateclient/v2/blacklists.py +++ b/designateclient/v2/blacklists.py @@ -13,10 +13,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from designateclient import client +from designateclient.v2.base import V2Controller -class BlacklistController(client.Controller): +class BlacklistController(V2Controller): def create(self, pattern, description=None): data = { 'pattern': pattern, diff --git a/designateclient/v2/limits.py b/designateclient/v2/limits.py index 1c89a07..ba99629 100644 --- a/designateclient/v2/limits.py +++ b/designateclient/v2/limits.py @@ -13,9 +13,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from designateclient import client +from designateclient.v2.base import V2Controller -class LimitController(client.Controller): +class LimitController(V2Controller): def get(self): return self._get('/limits') diff --git a/designateclient/v2/nameservers.py b/designateclient/v2/nameservers.py index 89c0a08..b35649d 100644 --- a/designateclient/v2/nameservers.py +++ b/designateclient/v2/nameservers.py @@ -13,11 +13,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from designateclient import client +from designateclient.v2.base import V2Controller from designateclient.v2 import utils as v2_utils -class NameServerController(client.Controller): +class NameServerController(V2Controller): def list(self, zone): zone = v2_utils.resolve_by_name(self.client.zones.list, zone) diff --git a/designateclient/v2/reverse.py b/designateclient/v2/reverse.py index 3279a02..99fe1d2 100644 --- a/designateclient/v2/reverse.py +++ b/designateclient/v2/reverse.py @@ -13,10 +13,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from designateclient import client +from designateclient.v2.base import V2Controller -class FloatingIPController(client.Controller): +class FloatingIPController(V2Controller): def set(self, floatingip_id, ptrdname, description=None, ttl=None): data = { 'ptrdname': ptrdname