Rename tobiko.openstack.heat modules.
Change-Id: I9fd4c1b7012238652ed515458d2c025eb54f141c
This commit is contained in:
parent
973913eb0f
commit
b6244de450
@ -13,16 +13,16 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from tobiko.openstack.heat import client
|
from tobiko.openstack.heat import _client
|
||||||
from tobiko.openstack.heat import template
|
from tobiko.openstack.heat import _template
|
||||||
from tobiko.openstack.heat import stack
|
from tobiko.openstack.heat import _stack
|
||||||
|
|
||||||
|
|
||||||
get_heat_client = client.get_heat_client
|
get_heat_client = _client.get_heat_client
|
||||||
HeatClientFixture = client.HeatClientFixture
|
HeatClientFixture = _client.HeatClientFixture
|
||||||
|
|
||||||
HeatTemplate = template.HeatTemplate
|
HeatTemplate = _template.HeatTemplate
|
||||||
get_heat_template = template.get_heat_template
|
get_heat_template = _template.get_heat_template
|
||||||
heat_template_file = template.heat_template_file
|
heat_template_file = _template.heat_template_file
|
||||||
|
|
||||||
HeatStackFixture = stack.HeatStackFixture
|
HeatStackFixture = _stack.HeatStackFixture
|
||||||
|
@ -21,8 +21,8 @@ from oslo_log import log
|
|||||||
|
|
||||||
import tobiko
|
import tobiko
|
||||||
from tobiko.common import exceptions
|
from tobiko.common import exceptions
|
||||||
from tobiko.openstack.heat import client as _client
|
from tobiko.openstack.heat import _client
|
||||||
from tobiko.openstack.heat import template as _template
|
from tobiko.openstack.heat import _template
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
@ -17,10 +17,11 @@ import collections
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import tobiko
|
|
||||||
from heatclient.common import template_utils
|
from heatclient.common import template_utils
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
import tobiko
|
||||||
|
|
||||||
|
|
||||||
TEMPLATE_SUFFIX = '.yaml'
|
TEMPLATE_SUFFIX = '.yaml'
|
||||||
|
|
@ -141,7 +141,7 @@ class HeatStackFixtureTest(base.OpenstackTest):
|
|||||||
call_create=True, call_delete=False, call_sleep=False):
|
call_create=True, call_delete=False, call_sleep=False):
|
||||||
client = mock.MagicMock(specs=heatclient.Client)
|
client = mock.MagicMock(specs=heatclient.Client)
|
||||||
get_heat_client = self.patch(
|
get_heat_client = self.patch(
|
||||||
'tobiko.openstack.heat.client.get_heat_client',
|
'tobiko.openstack.heat._client.get_heat_client',
|
||||||
return_value=client)
|
return_value=client)
|
||||||
if stack_states:
|
if stack_states:
|
||||||
client.stacks.get.side_effect = [
|
client.stacks.get.side_effect = [
|
||||||
@ -160,7 +160,7 @@ class HeatStackFixtureTest(base.OpenstackTest):
|
|||||||
default_template = heat.HeatTemplate.from_dict(
|
default_template = heat.HeatTemplate.from_dict(
|
||||||
{'default': 'template'})
|
{'default': 'template'})
|
||||||
get_heat_template = self.patch(
|
get_heat_template = self.patch(
|
||||||
'tobiko.openstack.heat.template.get_heat_template',
|
'tobiko.openstack.heat._template.get_heat_template',
|
||||||
return_value=default_template)
|
return_value=default_template)
|
||||||
|
|
||||||
stack.setUp()
|
stack.setUp()
|
||||||
|
Loading…
Reference in New Issue
Block a user