Some LBaaS API test returns wrong data

[Akihiro Motoki]

In some LBaaS API test, mocked neutronclient API returns Horizon internal objects instead of a dictionary returned from neutronclient.

diff --git a/openstack_dashboard/test/api_tests/lbaas_tests.py b/openstack_dashboard/test/api_tests/lbaas_tests.py
index f393e2a..e0cf693 100644
--- a/openstack_dashboard/test/api_tests/lbaas_tests.py
+++ b/openstack_dashboard/test/api_tests/lbaas_tests.py
@@ -57,7 +57,8 @@ class LbaasApiTests(test.APITestCase):
                         'admin_state_up': vip1['admin_state_up']
                         }

- neutronclient.create_vip({'vip': vipform_data}).AndReturn(vipform_data)
+ neutronclient.create_vip({'vip': vipform_data}).AndReturn(
+ {'vip': vipform_data})
         self.mox.ReplayAll()

         form_data = dict(vipform_data)
@@ -196,9 +197,9 @@ class LbaasApiTests(test.APITestCase):
         api.neutron.subnet_get(self.request, subnet.id).AndReturn(subnet)
         neutronclient.show_vip(pool.vip_id).AndReturn(vip_dict)
         neutronclient.list_members(pool_id=pool.id).AndReturn(
- {'members': self.members.list()})
+ {'members': self.api_members.list()})
         neutronclient.list_health_monitors(id=pool.health_monitors).AndReturn(
- {'health_monitors': [self.monitors.first()]})
+ {'health_monitors': [self.api_monitors.first()]})
         self.mox.ReplayAll()

         ret_val = api.lbaas.pool_get(self.request, pool.id)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/116295

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/116295
Committed: https://git.openstack.org/cgit/openstack/horizon/commit/?id=d83d6fe8e31d8a83d998a7716bd7e31a409561d6
Submitter: Jenkins
Branch: master

commit d83d6fe8e31d8a83d998a7716bd7e31a409561d6
Author: Akihiro Motoki <email address hidden>
Date: Fri Aug 22 23:22:33 2014 +0900

    Correct return values of mocked methods in LBaaS API test

    Mocked methods of neutronclient should return data structure
    which neutronclient returns, but Horizon internal API object
    (which inherits APIDictWrapper) is returned so far.

    Change-Id: Ifbaeea3234bc232c8bbd2bb6ed2dd8f236358d1b
    Closes-Bug: #1360279