Merge "Rename Openstack to OpenStack"
This commit is contained in:
@@ -53,7 +53,7 @@ paste.filter_factory = nova.api.ec2:Validator.factory
|
|||||||
paste.app_factory = nova.api.ec2:Executor.factory
|
paste.app_factory = nova.api.ec2:Executor.factory
|
||||||
|
|
||||||
#############
|
#############
|
||||||
# Openstack #
|
# OpenStack #
|
||||||
#############
|
#############
|
||||||
|
|
||||||
[composite:osapi_compute]
|
[composite:osapi_compute]
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
# Copyright (c) 2012 Openstack Foundation
|
# Copyright (c) 2012 OpenStack Foundation
|
||||||
# All Rights Reserved.
|
# All Rights Reserved.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
@@ -805,7 +805,7 @@ class HostFiltersTestCase(test.NoDBTestCase):
|
|||||||
self.assertTrue(filt_cls.host_passes(host, filter_properties))
|
self.assertTrue(filt_cls.host_passes(host, filter_properties))
|
||||||
|
|
||||||
def _do_test_compute_filter_extra_specs(self, ecaps, especs, passes):
|
def _do_test_compute_filter_extra_specs(self, ecaps, especs, passes):
|
||||||
"""In real Openstack runtime environment,compute capabilities
|
"""In real OpenStack runtime environment,compute capabilities
|
||||||
value may be number, so we should use number to do unit test.
|
value may be number, so we should use number to do unit test.
|
||||||
"""
|
"""
|
||||||
self._stub_service_is_up(True)
|
self._stub_service_is_up(True)
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
# Copyright (c) 2012 Openstack Foundation
|
# Copyright (c) 2012 OpenStack Foundation
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
# 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
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
# Copyright (c) 2013 Openstack Foundation
|
# Copyright (c) 2013 OpenStack Foundation
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
# 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
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
Reference in New Issue
Block a user