openstack
/
senlin
Code Issues Proposed changes

Change max api version 

Change max api version to "1.3" to support
"cluster_replace_nodes" action.

Change-Id: Ibf2fd5d9889de7fb680a582522ec87403131eb5f
This commit is contained in:
RUIJIE YUAN 2016-10-17 13:25:42 +08:00
parent 529cc05595
commit 8b0da69f5f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/api/openstack/v1/version.py
View File

@ -21,7 +21,7 @@ class VersionController(wsgi.Controller):
# This includes any semantic changes which may not affect the input or
# output formats or even originate in the API code layer.
_MIN_API_VERSION = "1.0"
_MAX_API_VERSION = "1.2"
_MAX_API_VERSION = "1.3"
DEFAULT_API_VERSION = _MIN_API_VERSION

7
senlin/tests/unit/api/common/test_version_request.py
View File

@ -96,14 +96,17 @@ class APIVersionRequestTests(base.SenlinTestCase):
vers1 = vr.APIVersionRequest("1.0")
vers2 = vr.APIVersionRequest("1.1")
vers3 = vr.APIVersionRequest("1.2")
vers4 = vr.APIVersionRequest("1.3")
v_null = vr.APIVersionRequest()
self.assertTrue(vers2.matches(vers1, vers3))
self.assertTrue(vers2.matches(vers1, vers4))
self.assertTrue(vers2.matches(vers1, v_null))
self.assertFalse(vers1.matches(vers2, vers3))
self.assertFalse(vers2.matches(vers3, vers1))
self.assertFalse(vers1.matches(vers2, vers4))
self.assertFalse(vers2.matches(vers4, vers1))
self.assertRaises(ValueError, v_null.matches, vers1, vers3)
self.assertRaises(ValueError, v_null.matches, vers1, vers4)
def test_as_string(self):
vers1_string = "3.23"

2
senlin/tests/unit/api/middleware/test_version_negotiation.py
View File

@ -170,7 +170,7 @@ class VersionNegotiationTest(base.SenlinTestCase):
def test__check_version_request(self, mock_vc):
controller = mock.Mock()
minv = vr.APIVersionRequest('1.0')
maxv = vr.APIVersionRequest('1.20')
maxv = vr.APIVersionRequest('1.3')
controller.min_api_version = mock.Mock(return_value=minv)
controller.max_api_version = mock.Mock(return_value=maxv)

1
senlin/tests/unit/api/openstack/v1/test_version.py
View File

@ -87,6 +87,7 @@ class APIVersionTest(base.SenlinTestCase):
self.assertTrue(self.vc.is_supported(req, '1.0', '1.1'))
self.assertTrue(self.vc.is_supported(req, '1.1', '1.1'))
self.assertFalse(self.vc.is_supported(req, '1.2'))
self.assertFalse(self.vc.is_supported(req, '1.3'))
def test_is_supported_max_version(self):
req = FakeRequest.blank('/fake', version='2.5')