34c7c8c2e2
Before v1 and v2 were set to the same service_type, so you could only have one set at a time. This assumes the catalog is setup for v1 service_type 'volume' and v2 service_type 'volumev2'. For backwards compatibility, we will allow v2 to be setup with service_type 'volume' for existing installations. Change-Id: Ife6d2cdb12d894b84ea3b276767fb93d487355d5
276 lines
10 KiB
Python
276 lines
10 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from cinderclient import exceptions
|
|
from cinderclient import service_catalog
|
|
from cinderclient.tests import utils
|
|
|
|
|
|
# Taken directly from keystone/content/common/samples/auth.json
|
|
# Do not edit this structure. Instead, grab the latest from there.
|
|
|
|
SERVICE_CATALOG = {
|
|
"access": {
|
|
"token": {
|
|
"id": "ab48a9efdfedb23ty3494",
|
|
"expires": "2010-11-01T03:32:15-05:00",
|
|
"tenant": {
|
|
"id": "345",
|
|
"name": "My Project"
|
|
}
|
|
},
|
|
"user": {
|
|
"id": "123",
|
|
"name": "jqsmith",
|
|
"roles": [
|
|
{
|
|
"id": "234",
|
|
"name": "compute:admin",
|
|
},
|
|
{
|
|
"id": "235",
|
|
"name": "object-store:admin",
|
|
"tenantId": "1",
|
|
}
|
|
],
|
|
"roles_links": [],
|
|
},
|
|
"serviceCatalog": [
|
|
{
|
|
"name": "Cloud Servers",
|
|
"type": "compute",
|
|
"endpoints": [
|
|
{
|
|
"tenantId": "1",
|
|
"publicURL": "https://compute1.host/v1/1234",
|
|
"internalURL": "https://compute1.host/v1/1234",
|
|
"region": "North",
|
|
"versionId": "1.0",
|
|
"versionInfo": "https://compute1.host/v1/",
|
|
"versionList": "https://compute1.host/"
|
|
},
|
|
{
|
|
"tenantId": "2",
|
|
"publicURL": "https://compute1.host/v1/3456",
|
|
"internalURL": "https://compute1.host/v1/3456",
|
|
"region": "North",
|
|
"versionId": "1.1",
|
|
"versionInfo": "https://compute1.host/v1/",
|
|
"versionList": "https://compute1.host/"
|
|
},
|
|
],
|
|
"endpoints_links": [],
|
|
},
|
|
{
|
|
"name": "Cinder Volume Service",
|
|
"type": "volume",
|
|
"endpoints": [
|
|
{
|
|
"tenantId": "1",
|
|
"publicURL": "https://volume1.host/v1/1234",
|
|
"internalURL": "https://volume1.host/v1/1234",
|
|
"region": "South",
|
|
"versionId": "1.0",
|
|
"versionInfo": "uri",
|
|
"versionList": "uri"
|
|
},
|
|
{
|
|
"tenantId": "2",
|
|
"publicURL": "https://volume1.host/v1/3456",
|
|
"internalURL": "https://volume1.host/v1/3456",
|
|
"region": "South",
|
|
"versionId": "1.1",
|
|
"versionInfo": "https://volume1.host/v1/",
|
|
"versionList": "https://volume1.host/"
|
|
},
|
|
],
|
|
"endpoints_links": [
|
|
{
|
|
"rel": "next",
|
|
"href": "https://identity1.host/v2.0/endpoints"
|
|
},
|
|
],
|
|
},
|
|
{
|
|
"name": "Cinder Volume Service V2",
|
|
"type": "volumev2",
|
|
"endpoints": [
|
|
{
|
|
"tenantId": "1",
|
|
"publicURL": "https://volume1.host/v2/1234",
|
|
"internalURL": "https://volume1.host/v2/1234",
|
|
"region": "South",
|
|
"versionId": "2.0",
|
|
"versionInfo": "uri",
|
|
"versionList": "uri"
|
|
},
|
|
{
|
|
"tenantId": "2",
|
|
"publicURL": "https://volume1.host/v2/3456",
|
|
"internalURL": "https://volume1.host/v2/3456",
|
|
"region": "South",
|
|
"versionId": "1.1",
|
|
"versionInfo": "https://volume1.host/v2/",
|
|
"versionList": "https://volume1.host/"
|
|
},
|
|
],
|
|
"endpoints_links": [
|
|
{
|
|
"rel": "next",
|
|
"href": "https://identity1.host/v2.0/endpoints"
|
|
},
|
|
],
|
|
},
|
|
],
|
|
"serviceCatalog_links": [
|
|
{
|
|
"rel": "next",
|
|
"href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar",
|
|
},
|
|
],
|
|
},
|
|
}
|
|
|
|
SERVICE_COMPATIBILITY_CATALOG = {
|
|
"access": {
|
|
"token": {
|
|
"id": "ab48a9efdfedb23ty3494",
|
|
"expires": "2010-11-01T03:32:15-05:00",
|
|
"tenant": {
|
|
"id": "345",
|
|
"name": "My Project"
|
|
}
|
|
},
|
|
"user": {
|
|
"id": "123",
|
|
"name": "jqsmith",
|
|
"roles": [
|
|
{
|
|
"id": "234",
|
|
"name": "compute:admin",
|
|
},
|
|
{
|
|
"id": "235",
|
|
"name": "object-store:admin",
|
|
"tenantId": "1",
|
|
}
|
|
],
|
|
"roles_links": [],
|
|
},
|
|
"serviceCatalog": [
|
|
{
|
|
"name": "Cloud Servers",
|
|
"type": "compute",
|
|
"endpoints": [
|
|
{
|
|
"tenantId": "1",
|
|
"publicURL": "https://compute1.host/v1/1234",
|
|
"internalURL": "https://compute1.host/v1/1234",
|
|
"region": "North",
|
|
"versionId": "1.0",
|
|
"versionInfo": "https://compute1.host/v1/",
|
|
"versionList": "https://compute1.host/"
|
|
},
|
|
{
|
|
"tenantId": "2",
|
|
"publicURL": "https://compute1.host/v1/3456",
|
|
"internalURL": "https://compute1.host/v1/3456",
|
|
"region": "North",
|
|
"versionId": "1.1",
|
|
"versionInfo": "https://compute1.host/v1/",
|
|
"versionList": "https://compute1.host/"
|
|
},
|
|
],
|
|
"endpoints_links": [],
|
|
},
|
|
{
|
|
"name": "Cinder Volume Service V2",
|
|
"type": "volume",
|
|
"endpoints": [
|
|
{
|
|
"tenantId": "1",
|
|
"publicURL": "https://volume1.host/v2/1234",
|
|
"internalURL": "https://volume1.host/v2/1234",
|
|
"region": "South",
|
|
"versionId": "2.0",
|
|
"versionInfo": "uri",
|
|
"versionList": "uri"
|
|
},
|
|
{
|
|
"tenantId": "2",
|
|
"publicURL": "https://volume1.host/v2/3456",
|
|
"internalURL": "https://volume1.host/v2/3456",
|
|
"region": "South",
|
|
"versionId": "1.1",
|
|
"versionInfo": "https://volume1.host/v2/",
|
|
"versionList": "https://volume1.host/"
|
|
},
|
|
],
|
|
"endpoints_links": [
|
|
{
|
|
"rel": "next",
|
|
"href": "https://identity1.host/v2.0/endpoints"
|
|
},
|
|
],
|
|
},
|
|
],
|
|
"serviceCatalog_links": [
|
|
{
|
|
"rel": "next",
|
|
"href": "https://identity.host/v2.0/endpoints?session=2hfh8Ar",
|
|
},
|
|
],
|
|
},
|
|
}
|
|
|
|
|
|
class ServiceCatalogTest(utils.TestCase):
|
|
def test_building_a_service_catalog(self):
|
|
sc = service_catalog.ServiceCatalog(SERVICE_CATALOG)
|
|
|
|
self.assertRaises(exceptions.AmbiguousEndpoints, sc.url_for,
|
|
service_type='compute')
|
|
self.assertEquals(sc.url_for('tenantId', '1', service_type='compute'),
|
|
"https://compute1.host/v1/1234")
|
|
self.assertEquals(sc.url_for('tenantId', '2', service_type='compute'),
|
|
"https://compute1.host/v1/3456")
|
|
|
|
self.assertRaises(exceptions.EndpointNotFound, sc.url_for,
|
|
"region", "South", service_type='compute')
|
|
|
|
def test_alternate_service_type(self):
|
|
sc = service_catalog.ServiceCatalog(SERVICE_CATALOG)
|
|
|
|
self.assertRaises(exceptions.AmbiguousEndpoints, sc.url_for,
|
|
service_type='volume')
|
|
self.assertEquals(sc.url_for('tenantId', '1', service_type='volume'),
|
|
"https://volume1.host/v1/1234")
|
|
self.assertEquals(sc.url_for('tenantId', '2', service_type='volume'),
|
|
"https://volume1.host/v1/3456")
|
|
|
|
self.assertEquals(sc.url_for('tenantId', '2', service_type='volumev2'),
|
|
"https://volume1.host/v2/3456")
|
|
self.assertEquals(sc.url_for('tenantId', '2', service_type='volumev2'),
|
|
"https://volume1.host/v2/3456")
|
|
|
|
self.assertRaises(exceptions.EndpointNotFound, sc.url_for,
|
|
"region", "North", service_type='volume')
|
|
|
|
def test_compatibility_service_type(self):
|
|
sc = service_catalog.ServiceCatalog(SERVICE_COMPATIBILITY_CATALOG)
|
|
|
|
self.assertEquals(sc.url_for('tenantId', '1', service_type='volume'),
|
|
"https://volume1.host/v2/1234")
|
|
self.assertEquals(sc.url_for('tenantId', '2', service_type='volume'),
|
|
"https://volume1.host/v2/3456")
|