openstack/deb-python-openstacksdk
Code Issues Proposed changes

Merge "Enable bare-metal service"

Browse Source
This commit is contained in:
Jenkins
2016-12-28 14:52:39 +00:00
committed by Gerrit Code Review
parent c628208e9c 43f680ae6f
commit 16520438c3
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/profile.py
View File

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

4
openstack/tests/unit/test_profile.py
View File

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