Merge "Enable bare-metal service"

This commit is contained in:
Jenkins 2016-12-28 14:52:39 +00:00 committed by Gerrit Code Review
commit 16520438c3
2 changed files with 6 additions and 0 deletions

View File

@ -55,6 +55,7 @@ import copy
import logging
import six
from openstack.bare_metal import bare_metal_service
from openstack.block_store import block_store_service
from openstack.cluster import cluster_service
from openstack.compute import compute_service
@ -92,6 +93,7 @@ class Profile(object):
self._services = {}
self._add_service(alarm_service.AlarmService(version="v2"))
self._add_service(bare_metal_service.BareMetalService(version="v1"))
self._add_service(block_store_service.BlockStoreService(version="v2"))
self._add_service(cluster_service.ClusterService(version="v1"))
self._add_service(compute_service.ComputeService(version="v2"))

View File

@ -20,6 +20,7 @@ class TestProfile(base.TestCase):
prof = profile.Profile()
expected = [
'alarming',
'baremetal',
'clustering',
'compute',
'database',
@ -37,6 +38,7 @@ class TestProfile(base.TestCase):
def test_default_versions(self):
prof = profile.Profile()
self.assertEqual('v1', prof.get_filter('baremetal').version)
self.assertEqual('v1', prof.get_filter('clustering').version)
self.assertEqual('v2', prof.get_filter('compute').version)
self.assertEqual('v1', prof.get_filter('database').version)
@ -54,6 +56,8 @@ class TestProfile(base.TestCase):
prof = profile.Profile()
prof.set_version('alarming', 'v2')
self.assertEqual('v2', prof.get_filter('alarming').version)
prof.set_version('baremetal', 'v1')
self.assertEqual('v1', prof.get_filter('baremetal').version)
prof.set_version('clustering', 'v1')
self.assertEqual('v1', prof.get_filter('clustering').version)
prof.set_version('compute', 'v2')