QoS: Remove type attribute from QoS rules

The type is given by object itself. We don't specify type when creating
resource cause it's a part of uri. This patch allows a
bandwidth_limit_rule to be created in given policy.

Partially-Implements: blueprint quantum-qos-api
Change-Id: Ica4626083054200e3b82bef23984462e7c596e1e

diff --git a/neutron/extensions/qos.py b/neutron/extensions/qos.py
index 1c89acac1158217d8190ff053d14123f5dfae030..76b9f6f8ac77a8e3944824aa02adf85ee17b8b48 100644 (file)
--- a/neutron/extensions/qos.py
+++ b/neutron/extensions/qos.py
@@ -37,9 +37,6 @@ QOS_RULE_COMMON_FIELDS = {
            'validate': {'type:uuid': None},
            'is_visible': True,
            'primary_key': True},
-    'type': {'allow_post': True, 'allow_put': True, 'is_visible': True,
-             'default': '',
-             'validate': {'type:values': VALID_RULE_TYPES}},
     'tenant_id': {'allow_post': True, 'allow_put': False,
                   'required_by_policy': True,
                   'is_visible': True},

diff --git a/neutron/objects/qos/rule.py b/neutron/objects/qos/rule.py
index 0b5713e73b4fb0e1b8c2b22a88653c2ce3a56933..b2bdd93f4b3e89eab5d7ae72b7ace0bb3e3334b0 100644 (file)
--- a/neutron/objects/qos/rule.py
+++ b/neutron/objects/qos/rule.py
@@ -32,6 +32,7 @@ class QosRule(base.NeutronObject):
 
     fields = {
         'id': obj_fields.UUIDField(),
+        #TODO(QoS): We ought to kill the `type' attribute
         'type': obj_fields.StringField(),
         'qos_policy_id': obj_fields.UUIDField()
     }

diff --git a/neutron/tests/tempest/services/network/json/network_client.py b/neutron/tests/tempest/services/network/json/network_client.py
index bbee873419c0f48e185d101786384aed857334a1..a95443294331447f86e2419512a6a85b2c063cef 100644 (file)
--- a/neutron/tests/tempest/services/network/json/network_client.py
+++ b/neutron/tests/tempest/services/network/json/network_client.py
@@ -657,8 +657,8 @@ class NetworkClientJSON(service_client.ServiceClient):
         post_data = self.serialize(
             {'bandwidth_limit_rule': {
                 'max_kbps': max_kbps,
-                'max_burst_kbps': max_burst_kbps,
-                'type': 'bandwidth_limit'}})
+                'max_burst_kbps': max_burst_kbps}
+            })
         resp, body = self.post(uri, post_data)
         self.expected_success(201, resp.status)
         body = json.loads(body)
@@ -687,8 +687,8 @@ class NetworkClientJSON(service_client.ServiceClient):
         post_data = {
             'bandwidth_limit_rule': {
                 'max_kbps': max_kbps,
-                'max_burst_kbps': max_burst_kbps,
-                'type': 'bandwidth_limit'}}
+                'max_burst_kbps': max_burst_kbps}
+            }
         resp, body = self.put(uri, json.dumps(post_data))
         self.expected_success(200, resp.status)
         return service_client.ResponseBody(resp, body)