Corrected 'collection_key' and 'key'
Changed the 'collection_key' in LanguagePackManager for sending a correct language pack url to solum-api. Changed the 'key' in LanguagePackManager for correctly parsing language pack 'show' and 'delete' commands. Fixes bug 1310749 Change-Id: I3025b15ea25cbcedf61fece6a50db3805db95ba9
This commit is contained in:
@@ -19,7 +19,7 @@ from solumclient.v1 import languagepack
|
|||||||
|
|
||||||
languagepack_list = [
|
languagepack_list = [
|
||||||
{
|
{
|
||||||
'uri': 'http://example.com/v1/languagepacks/x1',
|
'uri': 'http://example.com/v1/language_packs/x1',
|
||||||
'name': 'database',
|
'name': 'database',
|
||||||
'language_pack_type': 'python',
|
'language_pack_type': 'python',
|
||||||
'description': 'Python Language pack',
|
'description': 'Python Language pack',
|
||||||
@@ -33,7 +33,7 @@ languagepack_list = [
|
|||||||
'service_id': 1
|
'service_id': 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'uri': 'http://example.com/v1/languagepacks/x2',
|
'uri': 'http://example.com/v1/language_packs/x2',
|
||||||
'name': 'database',
|
'name': 'database',
|
||||||
'language_pack_type': 'java',
|
'language_pack_type': 'java',
|
||||||
'description': 'Java Language pack',
|
'description': 'Java Language pack',
|
||||||
@@ -49,7 +49,7 @@ languagepack_list = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
languagepack_fixture = {
|
languagepack_fixture = {
|
||||||
'uri': 'http://example.com/v1/languagepacks/x1',
|
'uri': 'http://example.com/v1/language_packs/x1',
|
||||||
'name': 'database',
|
'name': 'database',
|
||||||
'language_pack_type': 'java',
|
'language_pack_type': 'java',
|
||||||
'description': 'Java Language pack',
|
'description': 'Java Language pack',
|
||||||
@@ -64,7 +64,7 @@ languagepack_fixture = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fixtures_list = {
|
fixtures_list = {
|
||||||
'/v1/languagepacks': {
|
'/v1/language_packs': {
|
||||||
'GET': (
|
'GET': (
|
||||||
{},
|
{},
|
||||||
languagepack_list
|
languagepack_list
|
||||||
@@ -74,7 +74,7 @@ fixtures_list = {
|
|||||||
|
|
||||||
|
|
||||||
fixtures_get = {
|
fixtures_get = {
|
||||||
'/v1/languagepacks/x1': {
|
'/v1/language_packs/x1': {
|
||||||
'GET': (
|
'GET': (
|
||||||
{},
|
{},
|
||||||
languagepack_fixture
|
languagepack_fixture
|
||||||
@@ -84,7 +84,7 @@ fixtures_get = {
|
|||||||
|
|
||||||
|
|
||||||
fixtures_create = {
|
fixtures_create = {
|
||||||
'/v1/languagepacks': {
|
'/v1/language_packs': {
|
||||||
'POST': (
|
'POST': (
|
||||||
{},
|
{},
|
||||||
languagepack_fixture
|
languagepack_fixture
|
||||||
@@ -126,5 +126,5 @@ class LanguagePackManagerTest(base.TestCase):
|
|||||||
fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_get)
|
fake_http_client = fake_client.FakeHTTPClient(fixtures=fixtures_get)
|
||||||
api_client = sclient.Client(fake_http_client)
|
api_client = sclient.Client(fake_http_client)
|
||||||
mgr = languagepack.LanguagePackManager(api_client)
|
mgr = languagepack.LanguagePackManager(api_client)
|
||||||
languagepack_obj = mgr.get(languagepack_id='x1')
|
languagepack_obj = mgr.get(lp_id='x1')
|
||||||
self.assert_lp_object(languagepack_obj)
|
self.assert_lp_object(languagepack_obj)
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ class LanguagePack(apiclient_base.Resource):
|
|||||||
|
|
||||||
class LanguagePackManager(solum_base.CrudManager):
|
class LanguagePackManager(solum_base.CrudManager):
|
||||||
resource_class = LanguagePack
|
resource_class = LanguagePack
|
||||||
collection_key = 'languagepacks'
|
collection_key = 'language_packs'
|
||||||
key = 'languagepack'
|
key = 'lp'
|
||||||
|
|
||||||
def list(self, **kwargs):
|
def list(self, **kwargs):
|
||||||
return super(LanguagePackManager, self).list(base_url="/v1", **kwargs)
|
return super(LanguagePackManager, self).list(base_url="/v1", **kwargs)
|
||||||
|
|||||||
Reference in New Issue
Block a user