openstack
/
openstacksdk
Code Issues Proposed changes

Port unversioned Version resources to resource2 

Most services have a Version resource in their unversioned namespace,
generally predating the proxy interface. As such none of them are being
exposed or used as of right now, but rather than remove them we should
port them over as-is, then later figure out if we need to expose them
for use or if we don't actually need them.

Change-Id: I8f4ed67f6185bd1928ce73f8059d629dc0952f6b
This commit is contained in:
Brian Curtin 2017-04-27 16:23:17 -04:00
parent bfc88e76f3
commit 9d36974c2d
10 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack/cluster/version.py
View File

@ -12,7 +12,7 @@
from openstack.cluster import cluster_service
from openstack import resource
from openstack import resource2 as resource
class Version(resource.Resource):
@ -27,5 +27,5 @@ class Version(resource.Resource):
allow_list = True
# Properties
links = resource.prop('links')
status = resource.prop('status')
links = resource.Body('links')
status = resource.Body('status')

8
openstack/compute/version.py
View File

@ -11,7 +11,7 @@
# under the License.
from openstack.compute import compute_service
from openstack import resource
from openstack import resource2 as resource
class Version(resource.Resource):
@ -26,6 +26,6 @@ class Version(resource.Resource):
allow_list = True
# Properties
links = resource.prop('links')
status = resource.prop('status')
updated = resource.prop('updated')
links = resource.Body('links')
status = resource.Body('status')
updated = resource.Body('updated')

10
openstack/identity/version.py
View File

@ -11,7 +11,7 @@
# under the License.
from openstack.identity import identity_service
from openstack import resource
from openstack import resource2 as resource
class Version(resource.Resource):
@ -26,12 +26,12 @@ class Version(resource.Resource):
allow_list = True
# Properties
media_types = resource.prop('media-types')
status = resource.prop('status')
updated = resource.prop('updated')
media_types = resource.Body('media-types')
status = resource.Body('status')
updated = resource.Body('updated')
@classmethod
def list(cls, session, **params):
def list(cls, session, paginated=False, **params):
resp = session.get(cls.base_path, endpoint_filter=cls.service,
params=params)
resp = resp.json()

6
openstack/network/version.py
View File

@ -11,7 +11,7 @@
# under the License.
from openstack.network import network_service
from openstack import resource
from openstack import resource2 as resource
class Version(resource.Resource):
@ -26,5 +26,5 @@ class Version(resource.Resource):
allow_list = True
# Properties
links = resource.prop('links')
status = resource.prop('status')
links = resource.Body('links')
status = resource.Body('status')

6
openstack/orchestration/version.py
View File

@ -11,7 +11,7 @@
# under the License.
from openstack.orchestration import orchestration_service
from openstack import resource
from openstack import resource2 as resource
class Version(resource.Resource):
@ -26,5 +26,5 @@ class Version(resource.Resource):
allow_list = True
# Properties
links = resource.prop('links')
status = resource.prop('status')
links = resource.Body('links')
status = resource.Body('status')

4
openstack/tests/unit/cluster/test_version.py
View File

@ -31,13 +31,13 @@ class TestVersion(testtools.TestCase):
self.assertEqual('/', sot.base_path)
self.assertEqual('clustering', sot.service.service_type)
self.assertFalse(sot.allow_create)
self.assertFalse(sot.allow_retrieve)
self.assertFalse(sot.allow_get)
self.assertFalse(sot.allow_update)
self.assertFalse(sot.allow_delete)
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
self.assertEqual(EXAMPLE['id'], sot.id)
self.assertEqual(EXAMPLE['links'], sot.links)
self.assertEqual(EXAMPLE['status'], sot.status)

4
openstack/tests/unit/compute/test_version.py
View File

@ -32,13 +32,13 @@ class TestVersion(testtools.TestCase):
self.assertEqual('/', sot.base_path)
self.assertEqual('compute', sot.service.service_type)
self.assertFalse(sot.allow_create)
self.assertFalse(sot.allow_retrieve)
self.assertFalse(sot.allow_get)
self.assertFalse(sot.allow_update)
self.assertFalse(sot.allow_delete)
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
self.assertEqual(EXAMPLE['id'], sot.id)
self.assertEqual(EXAMPLE['links'], sot.links)
self.assertEqual(EXAMPLE['status'], sot.status)

10
openstack/tests/unit/identity/test_version.py
View File

@ -33,13 +33,13 @@ class TestVersion(testtools.TestCase):
self.assertEqual('/', sot.base_path)
self.assertEqual('identity', sot.service.service_type)
self.assertFalse(sot.allow_create)
self.assertFalse(sot.allow_retrieve)
self.assertFalse(sot.allow_get)
self.assertFalse(sot.allow_update)
self.assertFalse(sot.allow_delete)
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
self.assertEqual(EXAMPLE['id'], sot.id)
self.assertEqual(EXAMPLE['media-types'], sot.media_types)
self.assertEqual(EXAMPLE['status'], sot.status)
@ -58,8 +58,8 @@ class TestVersion(testtools.TestCase):
resp.json = mock.Mock(return_value=resp.body)
session = mock.Mock()
session.get = mock.Mock(return_value=resp)
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
result = sot.list(session)
self.assertEqual(next(result)['id'], 'v1.0')
self.assertEqual(next(result)['id'], 'v1.1')
self.assertEqual(next(result).id, 'v1.0')
self.assertEqual(next(result).id, 'v1.1')
self.assertRaises(StopIteration, next, result)

4
openstack/tests/unit/network/test_version.py
View File

@ -31,13 +31,13 @@ class TestVersion(testtools.TestCase):
self.assertEqual('/', sot.base_path)
self.assertEqual('network', sot.service.service_type)
self.assertFalse(sot.allow_create)
self.assertFalse(sot.allow_retrieve)
self.assertFalse(sot.allow_get)
self.assertFalse(sot.allow_update)
self.assertFalse(sot.allow_delete)
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
self.assertEqual(EXAMPLE['id'], sot.id)
self.assertEqual(EXAMPLE['links'], sot.links)
self.assertEqual(EXAMPLE['status'], sot.status)

4
openstack/tests/unit/orchestration/test_version.py
View File

@ -31,13 +31,13 @@ class TestVersion(testtools.TestCase):
self.assertEqual('/', sot.base_path)
self.assertEqual('orchestration', sot.service.service_type)
self.assertFalse(sot.allow_create)
self.assertFalse(sot.allow_retrieve)
self.assertFalse(sot.allow_get)
self.assertFalse(sot.allow_update)
self.assertFalse(sot.allow_delete)
self.assertTrue(sot.allow_list)
def test_make_it(self):
sot = version.Version(EXAMPLE)
sot = version.Version(**EXAMPLE)
self.assertEqual(EXAMPLE['id'], sot.id)
self.assertEqual(EXAMPLE['links'], sot.links)
self.assertEqual(EXAMPLE['status'], sot.status)