From 719f85e78e18ee5699a175501b9cafbeec2ca8f0 Mon Sep 17 00:00:00 2001 From: Artem Roma Date: Thu, 12 May 2016 16:10:39 +0300 Subject: [PATCH] Add 'vip_namespace' optional argument for fuel2 VIP create command Create operation for VIP accepts 'vip_namespace' as optional parameter. Its processing was added to VIP client as it was missing in the original patch for adding the commands to the client. Change-Id: Ibeab8f4c51758d13141b217daff613d90a0f40dd Related-Bug: #1576255 --- fuelclient/tests/unit/v2/lib/test_vip.py | 12 ++++-------- fuelclient/v1/vip.py | 5 ++++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/fuelclient/tests/unit/v2/lib/test_vip.py b/fuelclient/tests/unit/v2/lib/test_vip.py index 6826722..9bfb4f8 100644 --- a/fuelclient/tests/unit/v2/lib/test_vip.py +++ b/fuelclient/tests/unit/v2/lib/test_vip.py @@ -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) diff --git a/fuelclient/v1/vip.py b/fuelclient/v1/vip.py index 775a6a5..66aefd2 100644 --- a/fuelclient/v1/vip.py +++ b/fuelclient/v1/vip.py @@ -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)