openstack
/
python-cueclient
Code Issues Proposed changes

Rename end_points to endpoints in API 

Should be merged simultaneously with:
https://review.openstack.org/#/c/196287/
https://review.openstack.org/#/c/199317/

Change-Id: I3ada9a4934e4ba98322bd4ef8b1507fa86c7135c
Closes-Bug: 1439799
This commit is contained in:
dagnello 2015-06-26 16:58:14 -07:00
parent e6fdd249ad
commit 0c7559b9a1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cueclient/resources/schemas/v1/cluster.json
View File

@ -34,7 +34,7 @@
"description": "Date and time of cluster update",
"format": "date-time"
},
"end_points": {
"endpoints": {
"type": [
"array",
"null"

6
cueclient/tests/fixture_data.py
View File

@ -38,7 +38,7 @@ class V1(fixtures.Fixture):
"size": 1,
"network_id": ["05860da0-e2bd-4315-9cfb-7dd6e9963cd9"],
"created_at": "2015-01-01T00:00:00+00:00",
"end_points": [],
"endpoints": [],
"flavor": "1",
"status": "ACTIVE",
}
@ -49,7 +49,7 @@ class V1(fixtures.Fixture):
"size": 3,
"network_id": ["05567na0-f7aa-6820-7afcd-7dd6e9963cd9"],
"created_at": "2015-01-01T00:00:00+00:00",
"end_points": [],
"endpoints": [],
"flavor": "1",
"status": "BUILDING",
}
@ -60,7 +60,7 @@ class V1(fixtures.Fixture):
"size": 3,
"network_id": ["05567na0-f7aa-6820-7afcd-7dd6e9963cd9"],
"created_at": "2015-01-01T00:00:00+00:00",
"end_points": [],
"endpoints": [],
"flavor": "1",
"status": "BUILDING",
}

4
cueclient/tests/unit/v1/test_clusters.py
View File

@ -30,7 +30,7 @@ class TestListClusters(base.TestCueBase):
result = self.execute(clusters.ListClustersCommand, arglist,
verifylist)
self.assertEqual(['id', 'name', 'status', 'end_points'], result[0])
self.assertEqual(['id', 'name', 'status', 'endpoints'], result[0])
self.assert_called('GET', '/clusters')
for cluster in result[1]:
self.assertEqual(expected[cluster[0]], cluster)
@ -45,7 +45,7 @@ class TestShowCluster(base.TestCueBase):
verifylist = []
result = self.execute(clusters.ShowClusterCommand, arglist, verifylist)
expected = [('created_at', 'end_points', 'flavor', 'id', 'name',
expected = [('created_at', 'endpoints', 'flavor', 'id', 'name',
'network_id', 'size', 'status'),
(u'2015-01-01T00:00:00+00:00', [], '1',
'00000000-0000-0000-0000-000000001234',

2
cueclient/v1/cli/clusters.py
View File

@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
class ListClustersCommand(lister.Lister):
"""List Clusters"""
columns = ['id', 'name', 'status', 'end_points']
columns = ['id', 'name', 'status', 'endpoints']
def get_parser(self, prog_name):
parser = super(ListClustersCommand, self).get_parser(prog_name)

4
doc/source/command-line.rst
View File

@ -51,7 +51,7 @@ Required fields for 'create' : name, network id , flavor and size.
| Field | Value |
+-------------+--------------------------------------+
| created_at | 2015-02-17T18:25:28+00:00 |
| end_points | [] |
| endpoints | [] |
| flavor | 2 |
| id | 06d3c0e4-4972-4ca9-91c1-373b1c74e8e1 |
| name | cluster_04 |
@ -75,7 +75,7 @@ Required field for 'show' : cluster-id
| Field | Value |
+-------------+--------------------------------------+
| created_at | 2015-02-17T18:25:28+00:00 |
| end_points | [] |
| endpoints | [] |
| flavor | 2 |
| id | 06d3c0e4-4972-4ca9-91c1-373b1c74e8e1 |
| name | cluster_04 |