From 8ac8898ff3e617db8af9a8157cfb9fa49c05fa83 Mon Sep 17 00:00:00 2001 From: Buildbot Date: Fri, 29 Nov 2013 15:59:20 +0200 Subject: [PATCH] Fix expected response codes for port lib calls --- kamaki/clients/cyclades/__init__.py | 2 +- kamaki/clients/network/__init__.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kamaki/clients/cyclades/__init__.py b/kamaki/clients/cyclades/__init__.py index b09ec30..0372e83 100644 --- a/kamaki/clients/cyclades/__init__.py +++ b/kamaki/clients/cyclades/__init__.py @@ -251,7 +251,7 @@ class CycladesNetworkClient(NetworkClient): 'Invalid format for "fixed_ips"', details=[ 'fixed_ips format: [{"ip_address": IPv4}, ...]']) port['fixed_ips'] = fixed_ips - r = self.ports_post(json_data=dict(port=port), success=201) + r = self.ports_post(json_data=dict(port=port), success=200) return r.json['port'] def create_floatingip(self, floating_network_id, floating_ip_address=''): diff --git a/kamaki/clients/network/__init__.py b/kamaki/clients/network/__init__.py index 9c13382..1a3f883 100644 --- a/kamaki/clients/network/__init__.py +++ b/kamaki/clients/network/__init__.py @@ -180,7 +180,7 @@ class NetworkClient(NetworkRestClient, Waiter): return r.json['subnets'] def get_subnet_details(self, subnet_id): - r = self.subnets_get(subnet_id, success=201) + r = self.subnets_get(subnet_id, success=200) return r.json def update_subnet( @@ -250,7 +250,7 @@ class NetworkClient(NetworkRestClient, Waiter): port['fixed_ips'] = fixed_ips if security_groups: port['security_groups'] = security_groups - r = self.ports_post(json_data=dict(port=port), success=201) + r = self.ports_post(json_data=dict(port=port), success=200) return r.json['port'] def create_ports(self, ports): @@ -280,11 +280,11 @@ class NetworkClient(NetworkRestClient, Waiter): assert port.get('network_id', None), msg except AssertionError as ae: raise ValueError('%s' % ae) - r = self.ports_post(json_data=dict(ports=list(ports)), success=201) + r = self.ports_post(json_data=dict(ports=list(ports)), success=200) return r.json['ports'] def get_port_details(self, port_id): - r = self.ports_get(port_id, success=201) + r = self.ports_get(port_id, success=200) return r.json['port'] def delete_port(self, port_id): @@ -318,7 +318,7 @@ class NetworkClient(NetworkRestClient, Waiter): port['fixed_ips'] = fixed_ips if security_groups: port['security_groups'] = security_groups - r = self.ports_put(port_id, json_data=dict(port=port), success=201) + r = self.ports_put(port_id, json_data=dict(port=port), success=200) return r.json['port'] def list_floatingips(self): -- 1.7.10.4