The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
		
			
				
	
	
		
			128 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			128 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
# vim: tabstop=4 shiftwidth=4 softtabstop=4
 | 
						|
 | 
						|
# Copyright 2012, Red Hat, Inc.
 | 
						|
#
 | 
						|
#    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.
 | 
						|
 | 
						|
"""
 | 
						|
Client side of the scheduler manager RPC API.
 | 
						|
"""
 | 
						|
 | 
						|
from oslo.config import cfg
 | 
						|
 | 
						|
from nova.openstack.common import jsonutils
 | 
						|
import nova.openstack.common.rpc.proxy
 | 
						|
 | 
						|
rpcapi_opts = [
 | 
						|
    cfg.StrOpt('scheduler_topic',
 | 
						|
               default='scheduler',
 | 
						|
               help='the topic scheduler nodes listen on'),
 | 
						|
]
 | 
						|
 | 
						|
CONF = cfg.CONF
 | 
						|
CONF.register_opts(rpcapi_opts)
 | 
						|
 | 
						|
 | 
						|
class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
 | 
						|
    '''Client side of the scheduler rpc API.
 | 
						|
 | 
						|
    API version history:
 | 
						|
 | 
						|
        1.0 - Initial version.
 | 
						|
        1.1 - Changes to prep_resize():
 | 
						|
                - remove instance_uuid, add instance
 | 
						|
                - remove instance_type_id, add instance_type
 | 
						|
                - remove topic, it was unused
 | 
						|
        1.2 - Remove topic from run_instance, it was unused
 | 
						|
        1.3 - Remove instance_id, add instance to live_migration
 | 
						|
        1.4 - Remove update_db from prep_resize
 | 
						|
        1.5 - Add reservations argument to prep_resize()
 | 
						|
        1.6 - Remove reservations argument to run_instance()
 | 
						|
        1.7 - Add create_volume() method, remove topic from live_migration()
 | 
						|
 | 
						|
        2.0 - Remove 1.x backwards compat
 | 
						|
        2.1 - Add image_id to create_volume()
 | 
						|
        2.2 - Remove reservations argument to create_volume()
 | 
						|
        2.3 - Remove create_volume()
 | 
						|
        2.4 - Change update_service_capabilities()
 | 
						|
                - accepts a list of capabilities
 | 
						|
        2.5 - Add get_backdoor_port()
 | 
						|
        2.6 - Add select_hosts()
 | 
						|
    '''
 | 
						|
 | 
						|
    #
 | 
						|
    # NOTE(russellb): This is the default minimum version that the server
 | 
						|
    # (manager) side must implement unless otherwise specified using a version
 | 
						|
    # argument to self.call()/cast()/etc. here.  It should be left as X.0 where
 | 
						|
    # X is the current major API version (1.0, 2.0, ...).  For more information
 | 
						|
    # about rpc API versioning, see the docs in
 | 
						|
    # openstack/common/rpc/dispatcher.py.
 | 
						|
    #
 | 
						|
    BASE_RPC_API_VERSION = '2.0'
 | 
						|
 | 
						|
    def __init__(self):
 | 
						|
        super(SchedulerAPI, self).__init__(topic=CONF.scheduler_topic,
 | 
						|
                default_version=self.BASE_RPC_API_VERSION)
 | 
						|
 | 
						|
    def run_instance(self, ctxt, request_spec, admin_password,
 | 
						|
            injected_files, requested_networks, is_first_time,
 | 
						|
            filter_properties):
 | 
						|
        return self.cast(ctxt, self.make_msg('run_instance',
 | 
						|
                request_spec=request_spec, admin_password=admin_password,
 | 
						|
                injected_files=injected_files,
 | 
						|
                requested_networks=requested_networks,
 | 
						|
                is_first_time=is_first_time,
 | 
						|
                filter_properties=filter_properties))
 | 
						|
 | 
						|
    def prep_resize(self, ctxt, instance, instance_type, image,
 | 
						|
            request_spec, filter_properties, reservations):
 | 
						|
        instance_p = jsonutils.to_primitive(instance)
 | 
						|
        instance_type_p = jsonutils.to_primitive(instance_type)
 | 
						|
        reservations_p = jsonutils.to_primitive(reservations)
 | 
						|
        image_p = jsonutils.to_primitive(image)
 | 
						|
        self.cast(ctxt, self.make_msg('prep_resize',
 | 
						|
                instance=instance_p, instance_type=instance_type_p,
 | 
						|
                image=image_p, request_spec=request_spec,
 | 
						|
                filter_properties=filter_properties,
 | 
						|
                reservations=reservations_p))
 | 
						|
 | 
						|
    def show_host_resources(self, ctxt, host):
 | 
						|
        return self.call(ctxt, self.make_msg('show_host_resources', host=host))
 | 
						|
 | 
						|
    def live_migration(self, ctxt, block_migration, disk_over_commit,
 | 
						|
            instance, dest):
 | 
						|
        # NOTE(comstud): Call vs cast so we can get exceptions back, otherwise
 | 
						|
        # this call in the scheduler driver doesn't return anything.
 | 
						|
        instance_p = jsonutils.to_primitive(instance)
 | 
						|
        return self.call(ctxt, self.make_msg('live_migration',
 | 
						|
                block_migration=block_migration,
 | 
						|
                disk_over_commit=disk_over_commit, instance=instance_p,
 | 
						|
                dest=dest))
 | 
						|
 | 
						|
    def update_service_capabilities(self, ctxt, service_name, host,
 | 
						|
            capabilities):
 | 
						|
        self.fanout_cast(ctxt, self.make_msg('update_service_capabilities',
 | 
						|
                service_name=service_name, host=host,
 | 
						|
                capabilities=capabilities),
 | 
						|
                version='2.4')
 | 
						|
 | 
						|
    def get_backdoor_port(self, context, host):
 | 
						|
        return self.call(context, self.make_msg('get_backdoor_port'),
 | 
						|
                         version='2.5')
 | 
						|
 | 
						|
    def select_hosts(self, ctxt, request_spec, filter_properties):
 | 
						|
        return self.call(ctxt, self.make_msg('select_hosts',
 | 
						|
                request_spec=request_spec,
 | 
						|
                filter_properties=filter_properties),
 | 
						|
                version='2.6')
 |