From: Yalei Wang <yalei.wang@intel.com>
Date: Wed, 19 Aug 2015 16:09:04 +0000 (+0800)
Subject: Add missing tenant_id validation in RESOURCE_ATTRIBUTE_MAP
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a79bc732c5add649dc62742bd15a498e106bcd31;p=openstack-build%2Fneutron-build.git

Add missing tenant_id validation in RESOURCE_ATTRIBUTE_MAP

This patch will add the validation for tenant_id of 255 bytes string.

Change-Id: Iaa8f78d2b70693d3365a41834d29e0f12ad3dd36
Closes-Bug: #1486314
---

diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index ff0165be4..a89810a9e 100644
--- a/neutron/api/v2/attributes.py
+++ b/neutron/api/v2/attributes.py
@@ -825,7 +825,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                  'is_visible': True},
         'tenant_id': {'allow_post': True,
                       'allow_put': False,
-                      'validate': {'type:string': None},
+                      'validate': {'type:string': TENANT_ID_MAX_LEN},
                       'required_by_policy': True,
                       'is_visible': True},
         'prefixes': {'allow_post': True,
diff --git a/neutron/extensions/metering.py b/neutron/extensions/metering.py
index 82a24ae7b..22d67b5e0 100644
--- a/neutron/extensions/metering.py
+++ b/neutron/extensions/metering.py
@@ -55,6 +55,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                         'is_visible': True, 'default': ''},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
                       'is_visible': True},
         'shared': {'allow_post': True, 'allow_put': False,
                    'is_visible': True, 'default': False,
@@ -78,6 +79,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                              'validate': {'type:subnet': None}},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
                       'is_visible': True}
     }
 }
diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py
index f199f1202..5e32036ed 100644
--- a/neutron/extensions/securitygroup.py
+++ b/neutron/extensions/securitygroup.py
@@ -217,6 +217,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                         'is_visible': True, 'default': ''},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
                       'is_visible': True},
         'security_group_rules': {'allow_post': False, 'allow_put': False,
                                  'is_visible': True},
@@ -251,6 +252,7 @@ RESOURCE_ATTRIBUTE_MAP = {
                              'convert_to': convert_ip_prefix_to_cidr},
         'tenant_id': {'allow_post': True, 'allow_put': False,
                       'required_by_policy': True,
+                      'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
                       'is_visible': True},
     }
 }