openstack
/
magnum
Code Issues Proposed changes

Change service name from "magnum" to "container-infra" 

As per microversion guideline, the service type should be used for
microversion handling but service name(magnum) is being used. As per
devstack scripts type of the services has been changed to
"container-infra".

Change-Id: Icd52f75e76ef4126b7c269863a51b8aea459f597
Closes-Bug: #1590593
This commit is contained in:
Rajiv Kumar 2016-06-27 13:15:15 +05:30
parent 8cf12b0164
commit 899fbdd2f1
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/api/controllers/base.py
View File

@ -62,7 +62,7 @@ class Version(object):
max_string = 'X-OpenStack-API-Maximum-Version'
"""HTTP response header"""
service_string = 'magnum'
service_string = 'container-infra'
def __init__(self, headers, default_version, latest_version):
"""Create an API Version object from the supplied headers.

4
magnum/api/controllers/v1/__init__.py
View File

@ -48,10 +48,10 @@ BASE_VERSION = 1
#
# v1.1: API at the point in time when microversioning support was added
MIN_VER_STR = 'magnum 1.1'
MIN_VER_STR = 'container-infra 1.1'
# v1.1: Add API changelog here
MAX_VER_STR = 'magnum 1.1'
MAX_VER_STR = 'container-infra 1.1'
MIN_VER = controllers_base.Version(

2
magnum/tests/fakes.py
View File

@ -25,7 +25,7 @@ fakeAuthTokenHeaders = {'X-User-Id': u'773a902f022949619b5c2f32cd89d419',
'X-User-Domain-Name': 'domain',
'X-Project-Domain-Id': 'project_domain_id',
'X-User-Domain-Id': 'user_domain_id',
'X-OpenStack-API-Version': 'magnum 1.0'
'X-OpenStack-API-Version': 'container-infra 1.0'
}

26
magnum/tests/unit/api/controllers/test_base.py
View File

@ -22,9 +22,11 @@ class TestVersion(test_base.TestCase):
def setUp(self):
super(TestVersion, self).setUp()
self.a = base.Version(
{base.Version.string: "magnum 2.0"}, "magnum 2.0", "magnum 2.1")
{base.Version.string: "container-infra 2.0"},
"container-infra 2.0", "container-infra 2.1")
self.b = base.Version(
{base.Version.string: "magnum 2.0"}, "magnum 2.0", "magnum 2.1")
{base.Version.string: "container-infra 2.0"},
"container-infra 2.0", "container-infra 2.1")
def test__lt__with_higher_major_version(self):
self.a.major = 2
@ -105,32 +107,34 @@ class TestVersion(test_base.TestCase):
def test_parse_headers_ok(self):
version = base.Version.parse_headers(
{base.Version.string: 'magnum 123.456'}, mock.ANY, mock.ANY)
{base.Version.string: 'container-infra 123.456'},
mock.ANY, mock.ANY)
self.assertEqual((123, 456), version)
def test_parse_headers_latest(self):
for s in ['magnum latest', 'magnum LATEST']:
version = base.Version.parse_headers(
{base.Version.string: s}, mock.ANY, 'magnum 1.9')
{base.Version.string: s}, mock.ANY, 'container-infra 1.9')
self.assertEqual((1, 9), version)
def test_parse_headers_bad_length(self):
self.assertRaises(
exc.HTTPNotAcceptable,
base.Version.parse_headers,
{base.Version.string: 'magnum 1'},
{base.Version.string: 'container-infra 1'},
mock.ANY,
mock.ANY)
self.assertRaises(
exc.HTTPNotAcceptable,
base.Version.parse_headers,
{base.Version.string: 'magnum 1.2.3'},
{base.Version.string: 'container-infra 1.2.3'},
mock.ANY,
mock.ANY)
def test_parse_no_header(self):
# this asserts that the minimum version string is applied
version = base.Version.parse_headers({}, 'magnum 1.1', 'magnum 1.5')
version = base.Version.parse_headers({}, 'container-infra 1.1',
'container-infra 1.5')
self.assertEqual((1, 1), version)
def test_parse_incorrect_service_type(self):
@ -138,11 +142,11 @@ class TestVersion(test_base.TestCase):
exc.HTTPNotAcceptable,
base.Version.parse_headers,
{base.Version.string: '1.1'},
'magnum 1.1',
'magnum 1.1')
'container-infra 1.1',
'container-infra 1.1')
self.assertRaises(
exc.HTTPNotAcceptable,
base.Version.parse_headers,
{base.Version.string: 'nova 1.1'},
'magnum 1.1',
'magnum 1.1')
'container-infra 1.1',
'container-infra 1.1')