Fix ServerGroup.NAME_ATTR

Finding by specify server group name failed in ServerGroupsManager.find(),
ServerGroup.NAME_ATTR is "server_group_name" currently, but NAME_ATTR
should be "name", because only "name" attribute exists in ServerGroup
object, not "server_group_name".

Change-Id: Id6b7676d14e6283d856a069da5ff287dc3228386
Closes-Bug: #1563301
This commit is contained in:
Rui Chen 2016-03-30 10:20:52 +08:00
parent 8c204ac1a2
commit 51306fc4c9
2 changed files with 22 additions and 1 deletions

View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from novaclient import exceptions
from novaclient.tests.unit.fixture_data import client
from novaclient.tests.unit.fixture_data import server_groups as data
from novaclient.tests.unit import utils
@ -71,3 +72,24 @@ class ServerGroupsTest(utils.FixturedTestCase):
ret = server_group.delete()
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
self.assert_called('DELETE', '/os-server-groups/%s' % id)
def test_find_server_groups_by_name(self):
expected_name = 'ig1'
kwargs = {self.cs.server_groups.resource_class.NAME_ATTR:
expected_name}
server_group = self.cs.server_groups.find(**kwargs)
self.assert_request_id(server_group, fakes.FAKE_REQUEST_ID_LIST)
self.assert_called('GET', '/os-server-groups')
self.assertIsInstance(server_group, server_groups.ServerGroup)
actual_name = getattr(server_group,
self.cs.server_groups.resource_class.NAME_ATTR)
self.assertEqual(expected_name, actual_name)
def test_find_no_existing_server_groups_by_name(self):
expected_name = 'no-exist'
kwargs = {self.cs.server_groups.resource_class.NAME_ATTR:
expected_name}
self.assertRaises(exceptions.NotFound,
self.cs.server_groups.find,
**kwargs)
self.assert_called('GET', '/os-server-groups')

View File

@ -24,7 +24,6 @@ class ServerGroup(base.Resource):
"""
A server group.
"""
NAME_ATTR = 'server_group_name'
def __repr__(self):
return '<ServerGroup: %s>' % self.id