diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 950116a48414..c2172c19b0eb 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six import webob.exc from nova.api.openstack import common @@ -116,10 +115,7 @@ class Controller(wsgi.Controller): """ context = req.environ['nova.context'] filters = self._get_filters(req) - params = req.GET.copy() page_params = common.get_pagination_params(req) - for key, val in six.iteritems(page_params): - params[key] = val try: images = self._image_api.get_all(context, filters=filters, @@ -136,10 +132,7 @@ class Controller(wsgi.Controller): """ context = req.environ['nova.context'] filters = self._get_filters(req) - params = req.GET.copy() page_params = common.get_pagination_params(req) - for key, val in six.iteritems(page_params): - params[key] = val try: images = self._image_api.get_all(context, filters=filters, **page_params) diff --git a/nova/api/openstack/compute/plugins/v3/images.py b/nova/api/openstack/compute/plugins/v3/images.py index 5ad501ac8001..d706370aba1a 100644 --- a/nova/api/openstack/compute/plugins/v3/images.py +++ b/nova/api/openstack/compute/plugins/v3/images.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six import webob.exc from nova.api.openstack import common @@ -122,10 +121,7 @@ class ImagesController(wsgi.Controller): """ context = req.environ['nova.context'] filters = self._get_filters(req) - params = req.GET.copy() page_params = common.get_pagination_params(req) - for key, val in six.iteritems(page_params): - params[key] = val try: images = self._image_api.get_all(context, filters=filters, @@ -143,10 +139,7 @@ class ImagesController(wsgi.Controller): """ context = req.environ['nova.context'] filters = self._get_filters(req) - params = req.GET.copy() page_params = common.get_pagination_params(req) - for key, val in six.iteritems(page_params): - params[key] = val try: images = self._image_api.get_all(context, filters=filters, **page_params)