Merge "Add vip_qos_policy_id options for loadbalancer"
This commit is contained in:
@@ -30,7 +30,7 @@ class LoadBalancer(resource.Resource):
|
|||||||
_query_mapping = resource.QueryParameters(
|
_query_mapping = resource.QueryParameters(
|
||||||
'description', 'flavor', 'name', 'project_id', 'provider',
|
'description', 'flavor', 'name', 'project_id', 'provider',
|
||||||
'vip_address', 'vip_network_id', 'vip_port_id', 'vip_subnet_id',
|
'vip_address', 'vip_network_id', 'vip_port_id', 'vip_subnet_id',
|
||||||
'provisioning_status', 'operating_status',
|
'vip_qos_policy_id', 'provisioning_status', 'operating_status',
|
||||||
is_admin_state_up='admin_state_up'
|
is_admin_state_up='admin_state_up'
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -67,6 +67,8 @@ class LoadBalancer(resource.Resource):
|
|||||||
vip_port_id = resource.Body('vip_port_id')
|
vip_port_id = resource.Body('vip_port_id')
|
||||||
#: VIP subnet ID
|
#: VIP subnet ID
|
||||||
vip_subnet_id = resource.Body('vip_subnet_id')
|
vip_subnet_id = resource.Body('vip_subnet_id')
|
||||||
|
# VIP qos policy id
|
||||||
|
vip_qos_policy_id = resource.Body('vip_qos_policy_id')
|
||||||
|
|
||||||
def delete(self, session, error_message=None):
|
def delete(self, session, error_message=None):
|
||||||
request = self._prepare_request()
|
request = self._prepare_request()
|
||||||
|
@@ -35,6 +35,7 @@ EXAMPLE = {
|
|||||||
'vip_network_id': uuid.uuid4(),
|
'vip_network_id': uuid.uuid4(),
|
||||||
'vip_port_id': uuid.uuid4(),
|
'vip_port_id': uuid.uuid4(),
|
||||||
'vip_subnet_id': uuid.uuid4(),
|
'vip_subnet_id': uuid.uuid4(),
|
||||||
|
'vip_qos_policy_id': uuid.uuid4(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -80,6 +81,8 @@ class TestLoadBalancer(base.TestCase):
|
|||||||
test_load_balancer.vip_port_id)
|
test_load_balancer.vip_port_id)
|
||||||
self.assertEqual(EXAMPLE['vip_subnet_id'],
|
self.assertEqual(EXAMPLE['vip_subnet_id'],
|
||||||
test_load_balancer.vip_subnet_id)
|
test_load_balancer.vip_subnet_id)
|
||||||
|
self.assertEqual(EXAMPLE['vip_qos_policy_id'],
|
||||||
|
test_load_balancer.vip_qos_policy_id)
|
||||||
|
|
||||||
def test_delete_non_cascade(self):
|
def test_delete_non_cascade(self):
|
||||||
sess = mock.Mock()
|
sess = mock.Mock()
|
||||||
|
Reference in New Issue
Block a user