openstack/python-fuelclient
Code Issues Proposed changes

Merge "Add 'vip_namespace' optional argument for fuel2 VIP create command"

Browse Source
This commit is contained in:
Jenkins
2016-06-03 16:13:14 +00:00
committed by Gerrit Code Review
parent 5a0b0e5bd7 719f85e78e
commit fed0b8e780
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fuelclient/tests/unit/v2/lib/test_vip.py
View File

@@ -66,13 +66,9 @@ class TestVipFacade(test_api.BaseLibTest):
self.assertEqual(written_yaml, expected_yaml)
def test_vip_create(self):
expected = {'ip_addr': '127.0.0.1', 'vip_name': 'test', 'network': 1}
vip_kwargs = {'ip_addr': '127.0.0.1', 'vip_name': 'test', 'network': 1,
'vip_namespace': 'test-namespace'}
request_post = self.m_request.post(self.res_uri, json={})
self.client.create(
self.env_id,
ip_addr=expected['ip_addr'],
vip_name=expected['vip_name'],
network=expected['network']
)
self.client.create(self.env_id, **vip_kwargs)
self.assertTrue(request_post.called)
self.assertEqual(request_post.last_request.json(), expected)
self.assertEqual(request_post.last_request.json(), vip_kwargs)

5
fuelclient/v1/vip.py
View File

@@ -50,13 +50,16 @@ class VipClient(base_v1.BaseV1Client):
env.set_vips_data(vips_data)
@staticmethod
def create(env_id, ip_addr, network, vip_name):
def create(env_id, ip_addr, network, vip_name, vip_namespace=None):
env = objects.Environment(env_id)
vip_data = {
'ip_addr': ip_addr,
'network': network,
'vip_name': vip_name
}
if vip_namespace is not None:
vip_data['vip_namespace'] = vip_namespace
env.create_vip(**vip_data)