Merge "Do not allow name lookups on RBAC policies" into stable/liberty

The commit fcf289797c introduces the
pattern:

  if isinstance(line, bytes):
    try:
      line = line.decode(encoding='utf-8')
    except UnicodeError:
      pass
  # concat line with a string

which is not working in PY3K if an UnicodeError is raised because line
is not decoded and concatened to a string.

This change delegates decoding to safe_decode[1] which returns a text
object or raises an error.

[1] oslo_utils.encodeutils

Closes-Bug: #1503415
Related-Bug: #1499004
Change-Id: I16b8013f33aa3efad65be8040d3210120e047bbd
(cherry picked from commit 88eb5845b7)

.gitreview

@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/python-neutronclient.git
+defaultbranch=stable/liberty

neutronclient/neutron/v2_0/rbac.py

@@ -32,12 +32,14 @@ class ListRBACPolicy(neutronV20.ListCommand):
     list_columns = ['id', 'object_id']
     pagination_support = True
     sorting_support = True
+    allow_names = False
 
 
 class ShowRBACPolicy(neutronV20.ShowCommand):
     """Show information of a given RBAC policy."""
 
     resource = 'rbac_policy'
+    allow_names = False
 
 
 class CreateRBACPolicy(neutronV20.CreateCommand):
@@ -81,6 +83,7 @@ class UpdateRBACPolicy(neutronV20.UpdateCommand):
     """Update RBAC policy for given tenant."""
 
     resource = 'rbac_policy'
+    allow_names = False
 
     def add_known_arguments(self, parser):
         parser.add_argument(
@@ -100,3 +103,4 @@ class DeleteRBACPolicy(neutronV20.DeleteCommand):
     """Delete a RBAC policy."""
 
     resource = 'rbac_policy'
+    allow_names = False

neutronclient/tests/functional/hooks/gate_hook.sh

@@ -1,16 +1,12 @@
 #!/usr/bin/env bash
 
-
 set -ex
 
-
 VENV=${1:-"functional"}
 
-
 if [ "$VENV" == "functional-vpn" ]
 then
     export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas"
 fi
 
-remaining_time
-timeout -s 9 ${REMAINING_TIME}m $BASE/new/devstack-gate/devstack-vm-gate.sh
+$BASE/new/devstack-gate/devstack-vm-gate.sh

neutronclient/tests/unit/test_cli20.py

@@ -73,7 +73,7 @@ class FakeStdout(object):
     def make_string(self):
         result = ''
         for line in self.content:
-            result = result + line
+            result += encodeutils.safe_decode(line, 'utf-8')
         return result
 
 

neutronclient/v2_0/client.py

@@ -1716,7 +1716,7 @@ class Client(ClientBase):
         def _fx(obj, **_params):
             return self.show_ext(path, obj, **_params)
 
-        def _parent_fx(parent_id, obj, **_params):
+        def _parent_fx(obj, parent_id, **_params):
             return self.show_ext(path % parent_id, obj, **_params)
         fn = _fx if not parent_resource else _parent_fx
         setattr(self, "show_%s" % resource_plural, fn)
@@ -1743,7 +1743,7 @@ class Client(ClientBase):
         def _fx(obj):
             return self.delete_ext(path, obj)
 
-        def _parent_fx(parent_id, obj):
+        def _parent_fx(obj, parent_id):
             return self.delete_ext(path % parent_id, obj)
         fn = _fx if not parent_resource else _parent_fx
         setattr(self, "delete_%s" % resource_singular, fn)
@@ -1752,7 +1752,7 @@ class Client(ClientBase):
         def _fx(obj, body=None):
             return self.update_ext(path, obj, body)
 
-        def _parent_fx(parent_id, obj, body=None):
+        def _parent_fx(obj, parent_id, body=None):
             return self.update_ext(path % parent_id, obj, body)
         fn = _fx if not parent_resource else _parent_fx
         setattr(self, "update_%s" % resource_singular, fn)

requirements.txt

@@ -8,9 +8,9 @@ iso8601>=0.1.9
 netaddr!=0.7.16,>=0.7.12
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=2.0.0 # Apache-2.0
-requests>=2.5.2
-python-keystoneclient>=1.6.0
+oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0
+requests!=2.8.0,>=2.5.2
+python-keystoneclient!=1.8.0,>=1.6.0
 simplejson>=2.2.0
 six>=1.9.0
 Babel>=1.3