openstack/rally-openstack
Code Issues Proposed changes

Merge "[api_versions] Allow to use unknown services"

Browse Source
This commit is contained in:
Jenkins 2015-11-30 15:55:11 +00:00 committed by Gerrit Code Review
commit b16d8472c4
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rally/consts.py
View File

@ -91,10 +91,7 @@ class _Service(utils.ImmutableMixin, utils.EnumMixin):
NOVA = "nova"
NOVA_NET = "nova-network"
NOVAV21 = "novav21"
NOVAV3 = "novav3"
CINDER = "cinder"
CINDERV2 = "cinderv2"
MANILA = "manila"
EC2 = "ec2"
GLANCE = "glance"
@ -118,7 +115,6 @@ class _ServiceType(utils.ImmutableMixin, utils.EnumMixin):
"""OpenStack services types, mapped to service names."""
VOLUME = "volume"
VOLUMEV2 = "volumev2"
SHARE = "share"
EC2 = "ec2"
IMAGE = "image"
@ -126,8 +122,6 @@ class _ServiceType(utils.ImmutableMixin, utils.EnumMixin):
ORCHESTRATION = "orchestration"
IDENTITY = "identity"
COMPUTE = "compute"
COMPUTEV21 = "computev21"
COMPUTEV3 = "computev3"
NETWORK = "network"
DNS = "dns"
METERING = "metering"
@ -144,10 +138,7 @@ class _ServiceType(utils.ImmutableMixin, utils.EnumMixin):
def __init__(self):
self.__names = {
self.COMPUTE: _Service.NOVA,
self.COMPUTEV21: _Service.NOVAV21,
self.COMPUTEV3: _Service.NOVAV3,
self.VOLUME: _Service.CINDER,
self.VOLUMEV2: _Service.CINDERV2,
self.SHARE: _Service.MANILA,
self.EC2: _Service.EC2,
self.IMAGE: _Service.GLANCE,